[Oval-commits] r258 - trunk/oval-server/debian

[Javier Fernandez-Sanguino Pen~a]

Author: jfs
Date: 2007-09-04 22:26:00 +0000 (Tue, 04 Sep 2007)
New Revision: 258

Modified:
   trunk/oval-server/debian/rules
Log:
Instead of removing pyc files, just ask setup not to compile. Also, simplify use of PREFIX

Modified: trunk/oval-server/debian/rules
===================================================================
--- trunk/oval-server/debian/rules	2007-09-04 22:24:44 UTC (rev 257)
+++ trunk/oval-server/debian/rules	2007-09-04 22:26:00 UTC (rev 258)
@@ -11,6 +11,8 @@
 
 PYTHON_VERSION=$(shell /usr/bin/python -V 2>&1 | /usr/bin/perl -le 'print "$$1.$$2" if <> =~m/^Python\s+(\d+)\.(\d+)(\.\d+)*/')
 
+PREFIX := debian/oval-server/usr
+
 build: build-stamp
 
 build-stamp:  
@@ -36,18 +38,10 @@
 	dh_clean -k 
 	dh_installdirs
 
-	./setup.py install --prefix=$(CURDIR)/debian/oval-server/usr --install-lib=$(CURDIR)/debian/oval-server/usr/share/python-support/oval-server
+	./setup.py install --no-compile \
+	    --prefix=$(PREFIX)
+	    --install-lib=$(PREFIX)/share/oval-server
 
-	# Remove the generated .pyc files
-	( cd debian/oval-server/usr/share/python-support/oval-server/oval && \
-	  rm -f *.pyc && \
-	  cd dba && rm -f *.pyc && \
-	  cd ../dsa2oval && rm -f *.pyc && \
-	  cd definition && rm -f *.pyc && \
-	  cd ../parser && rm -f *.pyc && \
-	  cd ../../dsaSync && rm -f *.pyc && \
-	  cd ../server && rm -f *.pyc )
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
@@ -57,7 +51,7 @@
 	dh_installman debian/oval-server.1 debian/oval-monitor.1 debian/dsa2oval.1
 #	dh_installdebconf	
 #	dh_installlogrotate
-	dh_pysupport
+	dh_pysupport 
 	dh_python
 #	dh_installcron
 #	dh_installinfo