[omd-commits] OMD Git: omd: python-modules: Install target is using correct module path now

git version control git at mathias-kettner.de
Mon Jun 6 20:49:25 CEST 2016


Module:   omd
Branch:   master
Commit:   ce6fd81bbc0aa56ba4ca376155304b2524f69eb1
URL:      http://omdistro.org/projects/omd/repository/revisions/ce6fd81bbc0aa56ba4ca376155304b2524f69eb1

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 20:49:23 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 20:49:23 2016 +0200

python-modules: Install target is using correct module path now

---

 packages/python-modules/Makefile |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 1754530..e34a166 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -6,6 +6,7 @@ VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
 PYTHON   = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \
 	   $(shell pwd)/../python/tmp.python27/bin/python
+TMP_INSTALL_PATH = $(shell pwd)/tmp.python
 
 MODULES =
 # Modules really needed on all platforms
@@ -49,9 +50,8 @@ build: check-python
 	    fi ; \
 	done
 	set -e ; cd dest && \
-	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
-	    mkdir -p $$TMP_INSTALL_PATH/lib || true; \
-	    export PYTHONPATH=$$PYTHONPATH:$$TMP_INSTALL_PATH/lib ; \
+	    mkdir -p $(TMP_INSTALL_PATH)/lib || true; \
+	    export PYTHONPATH=$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
@@ -64,10 +64,10 @@ build: check-python
 		fi ; \
 		cd $$PKG ; \
 	        $(PYTHON) setup.py build ; \
-	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
+	        $(PYTHON) setup.py install --home=$(TMP_INSTALL_PATH) \
 	            --prefix='' \
-	            --install-platlib=$$TMP_INSTALL_PATH/lib \
-	            --install-purelib=$$TMP_INSTALL_PATH/lib ; \
+	            --install-platlib=$(TMP_INSTALL_PATH)/lib \
+	            --install-purelib=$(TMP_INSTALL_PATH)/lib ; \
 	        cd .. ; \
 	    done
 
@@ -80,7 +80,9 @@ check-python:
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
 	set -e ; cd dest && \
+	    export PYTHONPATH=$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    for M in $$(ls); do \
 		echo "Installing $$M..." ; \
 		cd $$M ; \



More information about the omd-commits mailing list