[med-svn] r15146 - trunk/packages/ctn/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-11-07 21:35:55 +0000 (Thu, 07 Nov 2013)
New Revision: 15146

Modified:
   trunk/packages/ctn/trunk/debian/rules
Log:
Put CFLAGS + LDFLAGS at the right place


Modified: trunk/packages/ctn/trunk/debian/rules
===================================================================
--- trunk/packages/ctn/trunk/debian/rules	2013-11-07 21:25:29 UTC (rev 15145)
+++ trunk/packages/ctn/trunk/debian/rules	2013-11-07 21:35:55 UTC (rev 15146)
@@ -22,6 +22,8 @@
 
 override_dh_auto_build: debian/intsizes.h
 	debian/test-sizes >| debian/ctnmake.debian.mysql.options.full
+	echo "CFLAGS=$(CFLAGS)" >> debian/ctnmake.debian.mysql.options.full
+	echo "LDFLAGS=$(LDFLAGS)" >> debian/ctnmake.debian.mysql.options.full
 	cat debian/ctnmake.debian.mysql.options >> debian/ctnmake.debian.mysql.options.full
 	mv debian/intsizes.h facilities/dicom/
 	chmod +x $(CURDIR)/apps/scripts/createdirectory
@@ -29,9 +31,7 @@
 	mkdir $(CURDIR)/lib
 	mkdir $(CURDIR)/include
 
-	# (. debian/debian.mysql.options.env; make install)
-	# Remark: when adding CFLAGS and LDFLAGS somehow ARCHITECTURE will not be set - no idea why
-	(. debian/debian.mysql.options.env; make CFLAGS="$(CFLAGS) -D$${ARCHITECTURE}" LDFLAGS="$(LDFLAGS)" install)
+	(. debian/debian.mysql.options.env; make install)
 
 override_dh_auto_clean:
 	dh_auto_clean