From: Zooko O'Whielacronx Date: Thu, 13 Sep 2007 01:56:33 +0000 (-0700) Subject: Makefile: re-order targets and let user's PYTHONPATH be included in the PP X-Git-Tag: allmydata-tahoe-0.6.0~143 X-Git-Url: https://git.rkrishnan.org/simplejson/provisioning?a=commitdiff_plain;h=31609aa98f8365644353769c10e259b6192788e9;p=tahoe-lafs%2Ftahoe-lafs.git Makefile: re-order targets and let user's PYTHONPATH be included in the PP --- diff --git a/Makefile b/Makefile index d687ffe5..c029d7b8 100644 --- 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)