[Demudi-commits] r1585 - csound/trunk/debian

[fsateler-guest at alioth.debian.org]

Author: fsateler-guest
Date: 2007-09-07 18:11:46 +0000 (Fri, 07 Sep 2007)
New Revision: 1585

Modified:
   csound/trunk/debian/custom.py
   csound/trunk/debian/rules
Log:
Move build flags back to rules since they didn't work from custom.py


Modified: csound/trunk/debian/custom.py
===================================================================
--- csound/trunk/debian/custom.py	2007-09-07 17:54:46 UTC (rev 1584)
+++ csound/trunk/debian/custom.py	2007-09-07 18:11:46 UTC (rev 1585)
@@ -19,26 +19,3 @@
 customCPPPATH.append('/usr/include/lua5.1')
 customCPPPATH.append('/usr/include/tcl8.4')
 
-useDouble=1
-usePortAudio=1
-usePortMIDI=1
-useALSA=1
-useJack=1
-useFLTK=1
-buildCsound5GUI=1
-buildWinsound=1
-generatePdf=0
-useOSC=1
-buildPythonOpcodes=1
-dynamicCsoundLibrary=1
-buildPDClass=1
-buildDSSI=1
-buildUtilities=1
-buildTclcsound=1
-buildVirtual=1
-buildInterfaces=1
-buildJavaWrapper=1
-buildCSEditor=1
-buildNewParser=0
-prefix=/usr
-

Modified: csound/trunk/debian/rules
===================================================================
--- csound/trunk/debian/rules	2007-09-07 17:54:46 UTC (rev 1584)
+++ csound/trunk/debian/rules	2007-09-07 18:11:46 UTC (rev 1585)
@@ -9,6 +9,13 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+BUILDFLAGS=useDouble=1 usePortAudio=1 usePortMIDI=1 useALSA=1 \
+	   useJack=1 useFLTK=1 buildCsound5GUI=1 buildWinsound=1 \
+	   generatePdf=0 useOSC=1 buildPythonOpcodes=1 \
+	   dynamicCsoundLibrary=1 buildPDClass=1 \
+	   buildDSSI=1 buildUtilities=1 buildTclcsound=1 \
+	   buildVirtual=1 buildInterfaces=1 buildJavaWrapper=1 \
+	   buildCSEditor=1 buildNewParser=0 prefix=/usr
 
 CSVERSION=5.06.0
 
@@ -28,7 +35,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: patch-stamp
 	cp debian/custom.py custom.py
-	scons CFLAGS="$(CFLAGS)"
+	scons $(BUILDFLAGS) CFLAGS="$(CFLAGS)"
 	touch $@
 
 build-indep: build-indep-stamp
@@ -41,7 +48,7 @@
 	rm -f build-arch-stamp build-indep-stamp
 # Scons needs the build flags or else it will not clean up most stuff
 ifneq "$(wildcard ./custom.py)" "" # We actually built something
-	scons -c
+	scons $(BUILDFLAGS) -c
 	rm custom.py
 # and there still is stuff that doesn't get deleted.
 	rm -f interfaces/*.java
@@ -67,7 +74,7 @@
 	dh_clean -k -s 
 	dh_installdirs -s
 	
-	scons install=1 instdir=$(CURDIR)/debian/tmp
+	scons $(BUILDFLAGS) install=1 instdir=$(CURDIR)/debian/tmp
 # Rename extract to csound-extract to avoid conflict with extract
 	mv $(CURDIR)/debian/tmp/usr/bin/extract \
 		$(CURDIR)/debian/tmp/usr/bin/csound_extract