Makefile: re-order targets and let user's PYTHONPATH be included in the PP

diff --git a/Makefile b/Makefile
index d687ffe58044f141f41d620681ca06058497a556..c029d7b864335ba0c8aad4f46034522788d2cae6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,15 +55,6 @@ TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors --reactor=$(REACTOR)
 show-instdir:
        @echo $(INSTDIR)/lib
 
-#PP=PYTHONPATH=$(PYTHONPATH)
-
-.PHONY: make-version build
-make-version:
-       $(PYTHON) misc/make-version.py "allmydata-tahoe" "src/allmydata/_version.py"
-
-build: make-version
-       $(PP) $(PYTHON) ./setup.py build_ext -i
-
 PYVER=$(shell $(PYTHON) misc/pyver.py)
 SUPPORT = $(BASE)/support
 SUPPORTLIB = $(SUPPORT)/lib/$(PYVER)/site-packages
@@ -75,7 +66,14 @@ EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py)
 show-eggspath:
        @echo $(EGGSPATH)
 
-PP = PYTHONPATH=$(EGGSPATH)
+PP=PYTHONPATH=$(EGGSPATH):$(PYTHONPATH)
+
+.PHONY: make-version build
+make-version:
+       $(PP) $(PYTHON) misc/make-version.py "allmydata-tahoe" "src/allmydata/_version.py"
+
+build: make-version
+       $(PP) $(PYTHON) ./setup.py build_ext -i
 
 # 'make install' will do the following:
 #   build+install tahoe (probably to /usr/lib/pythonN.N/site-packages)