diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2011-05-02 16:47:53 -0400 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2011-05-02 16:59:09 -0400 |
| commit | 3ffe5659769242c9e54c2d83c43632ba36735c0a (patch) | |
| tree | 435a70e886e45a576710c17edffa14eb379c54d1 /lib/addons | |
| parent | c1256eb9e733f4b65b5c2db8bd8769691b898310 (diff) | |
Fix trac 11461. third party python library PIL now builds correctly under linux.
Diffstat (limited to 'lib/addons')
| -rw-r--r-- | lib/addons/script.module.pil/Makefile.in (renamed from lib/addons/script.module.pil/Makefile) | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/addons/script.module.pil/Makefile b/lib/addons/script.module.pil/Makefile.in index 18b92b7d50..ba8ecb29aa 100644 --- a/lib/addons/script.module.pil/Makefile +++ b/lib/addons/script.module.pil/Makefile.in @@ -10,15 +10,14 @@ RETRIEVE_TOOL_FLAGS=-Ls --output $(ARCHIVE) ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf -PYTHONDIR=$(abs_top_srcdir)/lib/python ifeq ($(OSTYPE),Darwin) include ../../../tools/osx/osx-depends/config.mk PYTHON=$(prefix_path)/bin/python else -PYTHON=$(PYTHONDIR)/python +PYTHON=@PYTHON@ endif -DESTDIR=$(abs_top_srcdir)/addons/script.module.pil/lib/PIL +DESTDIR=@abs_top_srcdir@/addons/script.module.pil/lib/PIL CLEAN_FILES=$(ARCHIVE) $(SOURCE) $(DESTDIR) @@ -31,12 +30,9 @@ $(SOURCE): $(ARCHIVE) -rm -rf $(SOURCE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE) -$(DESTDIR): $(SOURCE) $(PYTHON) +$(DESTDIR): $(SOURCE) -rm -rf $(DESTDIR) - pushd $(SOURCE) && LD_LIBRARY_PATH=$(PYTHONDIR) $(PYTHON) setup.py build --build-lib $(DESTDIR); popd - -$(PYTHON): - $(MAKE) -C $(abs_top_srcdir) libpython + pushd $(SOURCE) && $(PYTHON) setup.py build --build-lib $(DESTDIR); popd include ../../../Makefile.include |