From: Zooko O'Whielacronx Date: Thu, 4 Oct 2007 21:11:16 +0000 (-0700) Subject: setup: attempt to work-around the problem that paths might end with trailing back... X-Git-Tag: allmydata-tahoe-0.6.1~55 X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=2ed8a272eddcc8a026450a710856df71671c21c9;p=tahoe-lafs%2Ftahoe-lafs.git setup: attempt to work-around the problem that paths might end with trailing back-slashes (on Windows) by appending a PATHSEP (i.e. ":" or ";") instead of an OSSEP (i.e. "/" or "\") I don't know what will happen if the path ends up with something like "C:\Programs and Files\Whatever\;" on Windows, and then that gets passed to cygwin bash. This reminds me of Brian's suggestion to use Python helper scripts (c.f. misc/find-dep-eggs.py) instead of writing this stuff in the GNUmake language. And *that* reminds me of the idea of writing the whole damn thing in Python instead of in GNUmake, i.e. make all of our build tools be plugins for setuptools instead of being GNUmake targets. --- diff --git a/Makefile b/Makefile index a061beb9..44fb0d21 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors $(REACTOROPT) # accomplish this by depending upon the tahoe compile. build-deps: .built check-twisted-dep mkdir -p "$(SUPPORTLIB)" - PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)." \ + PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \ $(PYTHON) misc/dependencies/build-deps-setup.py install \ --prefix="$(SUPPORT)" @@ -72,7 +72,10 @@ EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py) show-eggspath: @echo $(EGGSPATH) -PP=PYTHONPATH="$(SRCPATH)$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)$(OSSEP)." +ifneq ($(PYTHONPATH),) + PYTHONPATH := $(PYTHONPATH)$(PATHSEP) +endif +PP=PYTHONPATH="$(SRCPATH)$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)" .PHONY: make-version build make-version: