[SCM] Debian MIG packaging branch, master, updated. svn/end-9-g47ebb3d

[Guillem Jover]

The following commit has been merged in the master branch:
commit 47ebb3d7d695f22cb66bd70567448a34d49e5ea9
Author: Guillem Jover <address@hidden>
Date:   Wed Jun 1 03:12:58 2011 +0200

    Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS

diff --git a/debian/changelog b/debian/changelog
index bdc90df..82b0526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ mig (1.3.1.99-3) UNRELEASED; urgency=low
   * Add build-indep and build-arch targets and rename install target to
     install-arch in debian/rules.
   * Pass CFLAGS correctly to $(MAKE), instead of passing them as CCOPTIONS.
+  * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
 
   [ Samuel Thibault ]
   * Add Multi-Arch: foreign to allow installing the 32bit version on a 64bit
diff --git a/debian/control b/debian/control
index fed545e..401905d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Guillem Jover <address@hidden>,
 Homepage: http://www.gnu.org/software/hurd/mig.html
 Vcs-Browser: http://git.debian.org/?p=pkg-hurd/mig.git
 Vcs-Git: git://git.debian.org/pkg-hurd/mig.git
-Build-Depends: debhelper (>= 7), gnumach-dev, flex
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), gnumach-dev, flex
 Standards-Version: 3.9.2
 
 Package: mig
diff --git a/debian/rules b/debian/rules
index 1d89a02..e9064e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,9 @@ pkg := mig
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-CFLAGS = -Wall -g -pipe
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS := -Wall -pipe $(shell dpkg-buildflags --get CFLAGS)
+LDFAGS :=  $(shell dpkg-buildflags --get LDFLAGS)
 
 configure: stamp-configure
 stamp-configure:
@@ -34,7 +30,8 @@ build-indep:
 build-arch: configure
        dh_testdir
        
-       $(MAKE) -C build CFLAGS="$(CFLAGS)"
+       $(MAKE) -C build \
+         CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 build: build-indep build-arch
 

-- 
Debian MIG packaging