From 2ed8a272eddcc8a026450a710856df71671c21c9 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Thu, 4 Oct 2007 14:11:16 -0700 Subject: [PATCH] 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. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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: -- 2.45.2