[Pkg-zenoss-commits] r9 - packages/zenoss/trunk/debian

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-05-04 14:56:57 +0000 (Fri, 04 May 2007)
New Revision: 9

Modified:
   packages/zenoss/trunk/debian/rules
Log:
building the packages should work now (no clue if the packages are allright, though ;))


Modified: packages/zenoss/trunk/debian/rules
===================================================================
--- packages/zenoss/trunk/debian/rules	2007-05-04 13:06:51 UTC (rev 8)
+++ packages/zenoss/trunk/debian/rules	2007-05-04 14:56:57 UTC (rev 9)
@@ -25,6 +25,7 @@
 build-indep: build-indep-stamp
 
 build-arch-stamp: patch
+	#we don't want to use the delivered binary blob, rebuild it
 	cd wmi/Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
 	cd wmi; make build PYTHON=$(PYTHON) \
 	                   PYLIBDIR=/usr/lib/
@@ -63,15 +64,15 @@
 
 
 install-arch: build-arch
+	cd wmi/pycom; $(PYTHON) setup.py install \
+				--root=$(CURDIR)/debian/zenoss-wmi \
+				--install-purelib=/usr/share/python-support/zenoss-wmi \
+				--install-platlib=/usr/lib/python-support/zenoss-wmi/$(PYTHON) \
+				--no-compile -O0
 	cd wmi; make pywmi-installed PYTHON=$(PYTHON) \
                                      ZENBIN=/usr/bin \
 	                             DESTDIR=$(CURDIR)/debian/zenoss-wmi \
-	                             PYLIBDIR=/usr/lib/python-support/zenoss-wmi
-	cd wmi/pycom; $(PYTHON) setup.py install \
-				--root=$(CURDIR)/debian/zenoss-wmi \
-				--install-purelib=/usr/share/python-support/zenoss=wmi \
-				--install-platlib=/usr/lib/python-support/zenoss=wmi \
-				--no-compile -O0
+	                             PYLIBDIR=/usr/lib/python-support/zenoss-wmi/$(PYTHON)
 
 install-indep: build-indep
 	dh_testdir
@@ -126,6 +127,7 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
+	dh_install -i
 	dh_installchangelogs -i
 	dh_installdocs -i
 #	dh_installexamples -i
@@ -150,7 +152,7 @@
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb -i
-#	dh_shlibdeps -i
+#	dh_shlibdeps
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i