Makefile: use absolute path to src/ in PP, since check-memory needs it (it chdirs then imports allmydata)
This commit is contained in:
parent
32f25f33e3
commit
228a576a3f
4
Makefile
4
Makefile
|
@ -37,10 +37,12 @@ ifeq ($(PLAT),win32)
|
||||||
TRIALPATH := $(shell cygpath -w $(TRIALPATH))
|
TRIALPATH := $(shell cygpath -w $(TRIALPATH))
|
||||||
SUPPORT = $(shell cygpath -w $(shell pwd))\support
|
SUPPORT = $(shell cygpath -w $(shell pwd))\support
|
||||||
SUPPORTLIB := $(SUPPORT)\Lib\site-packages
|
SUPPORTLIB := $(SUPPORT)\Lib\site-packages
|
||||||
|
SRCPATH := $(shell cygpath -w $(shell pwd))\src
|
||||||
else
|
else
|
||||||
PYVER=$(shell $(PYTHON) misc/pyver.py)
|
PYVER=$(shell $(PYTHON) misc/pyver.py)
|
||||||
SUPPORT = $(shell pwd)/support
|
SUPPORT = $(shell pwd)/support
|
||||||
SUPPORTLIB = $(SUPPORT)/lib/$(PYVER)/site-packages
|
SUPPORTLIB = $(SUPPORT)/lib/$(PYVER)/site-packages
|
||||||
|
SRCPATH := $(shell pwd)/src
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PLAT),cygwin)
|
ifeq ($(PLAT),cygwin)
|
||||||
|
@ -65,7 +67,7 @@ EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py)
|
||||||
show-eggspath:
|
show-eggspath:
|
||||||
@echo $(EGGSPATH)
|
@echo $(EGGSPATH)
|
||||||
|
|
||||||
PP=PYTHONPATH="src$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)"
|
PP=PYTHONPATH="$(SRCPATH)$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)"
|
||||||
|
|
||||||
.PHONY: make-version build
|
.PHONY: make-version build
|
||||||
make-version:
|
make-version:
|
||||||
|
|
Loading…
Reference in New Issue