[omd-commits] OMD Git: omd: python-modules: Fixed build

git version control git at mathias-kettner.de
Mon Jun 6 08:50:29 CEST 2016


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

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

python-modules: Fixed build

---

 packages/python-modules/Makefile |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index bae685e..7d47f69 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -49,14 +49,19 @@ build: check-python
 	done
 	set -e ; cd dest && \
 	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
-	    mkdir $$TMP_INSTALL_PATH/lib || true; \
+	    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" ; \
 	    for M in $$(ls); do \
 		echo "Building $$M..." ; \
-		cd $$M ; \
+		PKG=$${M//.tar.gz/} ; \
+		PKG=$${PKG//.zip/} ; \
+		if [ $$PKG = pysnmp-git ]; then \
+		    PKG=pysnmp-master ; \
+		fi ; \
+		cd $$PKG ; \
 	        $(PYTHON) setup.py build ; \
 	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
 	            --prefix='' \



More information about the omd-commits mailing list