From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 27 Apr 2007 00:49:01 +0000 (-0700)
Subject: GNUmakefile: detect trial's location better on Windows
X-Git-Tag: allmydata-tahoe_v0.1.1-1-UNSTABLE~29
X-Git-Url: https://git.rkrishnan.org/pf/content/it.html?a=commitdiff_plain;h=a1241e68b181ab345a5761bf85f9491700e92d3c;p=tahoe-lafs%2Ftahoe-lafs.git

GNUmakefile: detect trial's location better on Windows
---

diff --git a/GNUmakefile b/GNUmakefile
index 8207c021..ac197fee 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,13 @@ INSTDIR=$(BASE)/instdir
 PATHSEP=$(shell python -c 'import os ; print os.pathsep')
 TRIALPATH=$(shell which trial.py 2>/dev/null)
 ifeq ($(TRIALPATH),)
-TRIALPATH=$(shell which trial)
+TRIALPATH=$(shell which trial 2>/dev/null)
+endif
+ifeq ($(TRIALPATH),)
+TRIALPATH=$(shell $(PYTHON) -c "import os, sys; print repr(os.path.join(sys.prefix, \"Scripts\", \"trial.py\"))")
+endif
+ifeq ($(TRIALPATH),)
+TRIALPATH=$(shell $(PYTHON) -c "import os, sys; print repr(os.path.join(sys.prefix, \"Scripts\", \"trial\"))")
 endif
 
 EXTRA_SETUP_ARGS=
@@ -36,7 +42,6 @@ PYTHONPATH := "$(INSTDIR)"
 endif
 
 TRIAL=$(PYTHON) -u "$(TRIALPATH)" --reactor=$(REACTOR)
-# $(error $(TRIAL))
 
 show-instdir:
 	@echo $(INSTDIR)