[omd-commits] OMD Git: omd: rrdtool: install python bindings into lib directory

git version control git at mathias-kettner.de
Thu Sep 19 13:29:23 CEST 2013


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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Sep 19 13:29:19 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Sep 19 13:29:19 2013 +0200

rrdtool: install python bindings into lib directory

---

 packages/rrdtool/Makefile |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 7f0c4fe..464b419 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -16,7 +16,7 @@ build:
         echo "applying $$p..." ; \
         ( cd $(DIR) ; patch -p1 -b ) < $$p ; \
         done
-
+	
 	# set perl environment to match the other perl modules
 	echo "install  --install_base  $(DESTDIR)$(OMD_ROOT)/lib/perl5" > .modulebuildrc
 	export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \
@@ -26,7 +26,7 @@ build:
 	  cd $(DIR) && \
 	  ./configure $(CONFIGUREOPTS) && \
 	  $(MAKE) all
-
+	
 	# Python binding
 	cd $(DIR)/bindings/python && python setup.py build
 
@@ -39,9 +39,13 @@ install:
 	install -m 644 $(DIR)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/COPYRIGHT $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/CONTRIBUTORS $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
-
+	
 	# Python binding
 	cd $(DIR)/bindings/python && python setup.py install --root=$(DESTDIR)/$(OMD_ROOT) --home ""
+	if [ -n "$(DESTDIR)$(OMD_ROOT)" -a -d "$(DESTDIR)$(OMD_ROOT)/lib64" ] ; then \
+	    rsync -avh $(DESTDIR)$(OMD_ROOT)/lib64/* $(DESTDIR)$(OMD_ROOT)/lib/ ; \
+	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; \
+	fi
 
 skel:
 



More information about the omd-commits mailing list