[clanlib] 03/05: Use dpkg-buildflags to set the flags.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository clanlib.

commit 43993280435b193f8dd53fe6dea86d81155d0747
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jun 11 15:20:39 2016 +0200

    Use dpkg-buildflags to set the flags.
---
 debian/changelog | 2 ++
 debian/rules     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f064536..f91b2df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ clanlib (1.0~svn3827-5) UNRELEASED; urgency=medium
   * Restrict the libasound2-dev build-dependency using linux-any. (Closes:
     #634700)
   * Build-depend on libmikmod-dev. (Closes: #744908)
+  * Use dpkg-buildflags to set the flags (in particular, this gives useful
+    debug packages).
   * Clean up debian/control with cme.
   * Standards-Version 3.9.8, no further change required.
 
diff --git a/debian/rules b/debian/rules
index f24c98e..5de14ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ else
 	use_asm386=no
 endif
 
-CFLAGS := -fPIC -DDEBUG=1 -I/usr/include/lua40
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -fPIC -DDEBUG=1
 ifneq (,$(findstring functions,$(CLAN_BUILD_OPTIONS)))
 	CFLAGS += -ffunction-sections
 endif
@@ -31,7 +32,7 @@ CONFIG_FLAGS	:= \
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIG_FLAGS)
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ./configure $(CONFIG_FLAGS)
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git