Use dpkg-buildflags to get CFLAGS, CPPFLAGS, and LDFLAGS.

diff --git a/changelog b/changelog
index ca0ccfa63f09bbe252607bf56721879ee1f6e897..a018653f361f31adfcc90c2e21d40c1146b7e4da 100644 (file)
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ dma (0.0.2009.07.17-4) UNRELEASED; urgency=low
     proposed format and bump the year on my copyright notice.
   * Remove the diffsrc rules target which was intended for my own
     internal use, but has outlived its time.
+  * Use dpkg-buildflags from dpkg-dev >= 1.15.7~ to get the default
+    values for CFLAGS, CPPFLAGS, and LDFLAGS; no longer rely on
+    dpkg-buildpackage to set them by default.
 
  -- Peter Pentchev <roam@ringlet.net>  Wed, 02 Jun 2010 14:10:05 +0300
 

diff --git a/control b/control
index 9a2c7c30280fb6be4ba59937281e0ec3375579ed..aa755c491e05153e58974e2fa82c6c811a109e43 100644 (file)
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: dma
 Section: mail
 Priority: optional
 Maintainer: Peter Pentchev <roam@ringlet.net>
-Build-Depends: debhelper (>= 7.0.50), byacc, flex, hardening-wrapper, liblockfile-dev, libssl-dev, pmake, po-debconf
+Build-Depends: debhelper (>= 7.0.50), byacc, dpkg-dev (>= 1.15.7~), flex, hardening-wrapper, liblockfile-dev, libssl-dev, pmake, po-debconf
 Standards-Version: 3.8.4
 Homepage: http://devel.ringlet.net/mail/dma/
 Vcs-Svn: http://svn.ringlet.net/svn/ringlet/mail/dma/trunk/dma-pkg/debian/

diff --git a/rules b/rules
index 88b4931b1f9b1645cf6de4fd1a0d0c63bd784645..371ff2e9096e7d3406d7410fc92772cb4ec24df8 100755 (executable)
--- a/rules
+++ b/rules
@@ -4,6 +4,10 @@
 
 PACKAGE=       dma
 
+CFLAGS=                $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS=      $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS=       $(shell dpkg-buildflags --get LDFLAGS)
+
 ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
        CFLAGS+=        -Werror
 endif
@@ -16,7 +20,7 @@ else
 export DEB_BUILD_HARDENING=0
 endif
 
-export CFLAGS
+export CFLAGS CPPFLAGS LDFLAGS
 
 override_dh_auto_build:
        pmake