[omd-commits] OMD Git: omd: mod_python: fix compile problem on lenny

git version control git at mathias-kettner.de
Sat Jun 18 13:40:05 CEST 2011


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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sat Jun 18 13:40:01 2011 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sat Jun 18 13:40:01 2011 +0200

mod_python: fix compile problem on lenny

---

 packages/mod_python/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index 7989833..6334247 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -20,11 +20,15 @@ install:
 	# Use 'make install' of mod_python into a temporary file.
 	# mod_python does not honor --prefix, so we move the stuff over...
 	make DESTDIR=$$(pwd)/tmp.root -C $(DIR) install
+	# Fix case where not usr/local but usr is used (lenny)
+	if [ ! -e tmp.root/usr/local ] ; then \
+	    ln -s . tmp.root/usr/local ; \
+	fi
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/apache/modules
 	install -m 644 tmp.root/usr/lib*/*/modules/mod_python.so $(DESTDIR)$(OMD_ROOT)/lib/apache/modules
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python/mod_python
-	install tmp.root/usr/local/lib*/*/dist-packages/mod_python/* $(DESTDIR)$(OMD_ROOT)/lib/python/mod_python
-	install -m 644 tmp.root/usr/local/lib*/python*/dist-packages/mod_python-3.3.1.egg-info $(DESTDIR)$(OMD_ROOT)/lib/python
+	install tmp.root/usr/local/lib*/*/*packages/mod_python/* $(DESTDIR)$(OMD_ROOT)/lib/python/mod_python
+	install -m 644 tmp.root/usr/local/lib*/python*/*packages/mod_python-3.3.1.egg-info $(DESTDIR)$(OMD_ROOT)/lib/python
 	rm -rf tmp.root
 
 skel:



More information about the omd-commits mailing list