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

[Andreas Tille]

Author: tille
Date: 2013-11-07 17:02:34 +0000 (Thu, 07 Nov 2013)
New Revision: 15142

Modified:
   trunk/packages/ctn/trunk/debian/rules
Log:
Cleaning up rules; propagate hardening options -> needs patch to build with -Wformat=


Modified: trunk/packages/ctn/trunk/debian/rules
===================================================================
--- trunk/packages/ctn/trunk/debian/rules	2013-11-07 16:51:09 UTC (rev 15141)
+++ trunk/packages/ctn/trunk/debian/rules	2013-11-07 17:02:34 UTC (rev 15142)
@@ -1,16 +1,8 @@
 #!/usr/bin/make -f
 
-build	:= debian/tmp
 pkg-ctn	:= ctn
 pkg-ctn-dev := ctn-dev
 
-INSTALL	:= install
-INSTALLFLAGS	:= -g root -o root -m 0644
-INSTALLEXECFLAGS:= -g root -o root
-INSTALLDIRFLAGS	:= -d -g root -o root -m 0755
-
-DOCDIR		:= $(CURDIR)/debian/$(pkg-ctn)/usr/share/doc/$(pkg-ctn)
-
 %:
 	dh $@
 
@@ -37,8 +29,7 @@
 	mkdir $(CURDIR)/lib
 	mkdir $(CURDIR)/include
 
-	(. debian/debian.mysql.options.env; make install)
-	ls -la debian/tmp
+	(. debian/debian.mysql.options.env; make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" install)
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -66,9 +57,6 @@
 override_dh_auto_install:
 	echo 'Do not try to call `make install` since it requires setting variable DICOM_MAKE'
 
-override_dh_install:
-	dh_install
-
 override_dh_fixperms:
 	dh_fixperms
 	chmod +x `echo $(CURDIR)/debian/$(pkg-ctn)/usr/share/ctn/mysql/*`