[Initscripts-ng-commits] r800 - in /trunk/src/insserv/debian: changelog rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Jul 23 12:08:29 2008
New Revision: 800

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=800
Log:
Handle CFLAGS in debian/rules more consistently, different options were
passed to make in build and install targets, and dpkg now also tampers
with the variable.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/rules

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=800&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Jul 23 12:08:29 2008
@@ -43,8 +43,11 @@
     passed before was not by design but by luck, as per upstream analysis
     which is included with test code.
   * Add 90_fix_bashism_in_makefile.dpatch to correct bashism used (echo -e)
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 23 Jul 2008 21:50:22 +1000
+  * Handle CFLAGS in debian/rules more consistently, different options were
+    passed to make in build and install targets, and dpkg now also tampers
+    with the variable.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 23 Jul 2008 22:07:16 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=800&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Wed Jul 23 12:08:29 2008
@@ -7,9 +7,9 @@
 PACKAGE = insserv
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CFLAGS = -g -O0
 else
-	CFLAGS += -O2
+	CFLAGS = -g -O2
 endif
 
 #CFLAGS += -DDEBUG=1
@@ -55,7 +55,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/$(PACKAGE).
-	$(MAKE) install DESTDIR=$(DESTDIR)
+	$(MAKE) install COPTS="$(CFLAGS)" DESTDIR=$(DESTDIR)
 
 	$(INSTALL_DATA) debian/overrides/* $(DESTDIR)$(pkgdatadir)/overrides/.
 	$(INSTALL) debian/check-initd-order $(DESTDIR)$(pkgdatadir)/.