From 6abeb002287effb250599f3923dbd6913e3f8e38 Mon Sep 17 00:00:00 2001
From: Steve Langasek <vorlon@debian.org>
Date: Sat, 24 Sep 2011 01:23:19 +0000
Subject: Build-depend on debhelper 8.9.4 and bump debian/compat to 9 for
 dpkg-buildflags integration, and drop manual setting of -g -O options in
 CFLAGS now that we can let dh do it for us

---
 debian/rules | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 2c11444c..5784bd1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
 
-LDFLAGS	:= -Wl,-z,defs
-CFLAGS	:= -g $(shell getconf LFS_CFLAGS)
-
-ifeq (,$(findstring noopt, ${DEB_BUILD_OPTIONS}))
-CFLAGS += -O2
-else
-CFLAGS += -O0
-endif
+DEB_LDFLAGS_MAINT_APPEND := -Wl,-z,defs
+DEB_CFLAGS_MAINT_APPEND  := $(shell getconf LFS_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND
 
 DEB_HOST_MULTIARCH	:= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -25,8 +20,7 @@ dl = $(d)/local
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-static --enable-shared \
 		--libdir=/lib/$(DEB_HOST_MULTIARCH) --sbindir=/sbin \
-		--enable-isadir=/lib/security --disable-audit \
-		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+		--enable-isadir=/lib/security --disable-audit
 
 # make sure the SAG, MWG, ADG are readable with a browser.
 override_dh_compress:
-- 
cgit v1.2.3