[med-svn] [gentle] 01/02: Fix propagation of CXXFLAGS

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gentle.

commit 9dfcd3d2c702e154197fb944a2c7cf11c106ca9c
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 1 14:23:36 2017 +0100

    Fix propagation of CXXFLAGS
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 +-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca9d27f..2de3be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gentle (1.9+cvs20100605+dfsg1-6) UNRELEASED; urgency=medium
+
+  * Fix propagation of CXXFLAGS
+    Closes: #853830
+
+ -- Andreas Tille <tille at debian.org>  Wed, 01 Feb 2017 14:20:43 +0100
+
 gentle (1.9+cvs20100605+dfsg1-5) unstable; urgency=medium
 
   * cme fix dpkg-control
diff --git a/debian/rules b/debian/rules
index bcb5ceb..0c5b8c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,12 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CXXFLAGS = "-D__DEBIAN__ -O2 -g -Wno-write-strings -DUSE_EXTERNAL_CLUSTALW"
+export DEB_CXXFLAGS_MAINT_APPEND = -D__DEBIAN__ -O2 -g -Wno-write-strings -DUSE_EXTERNAL_CLUSTALW
 DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
 %:
 	dh $@ --with autoreconf
 
-override_dh_auto_configure:
-	CXXFLAGS=$(CXXFLAGS) dh_auto_configure
-
-override_dh_auto_build:
-	$(MAKE) -k CXXFLAGS=$(CXXFLAGS) 
-
 override_dh_install:
 	dh_install --list-missing
 	cd debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME); for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gentle.git