[Pkg-nagios-changes] [icinga] 24/36: Don't set {C, CPP, LD}FLAGS explicitly, already set by debhelper.

[Bas Couwenberg]

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

sebastic pushed a commit to branch modern-packaging
in repository icinga.

commit 64eb1511f6fc84ea43ff569e9d1410b9480be690
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 18 11:57:43 2016 +0100

    Don't set {C,CPP,LD}FLAGS explicitly, already set by debhelper.
---
 debian/changelog | 1 +
 debian/rules     | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34495b7..da67885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ icinga (1.13.3-4) UNRELEASED; urgency=medium
   * Don't install p1.pl with execute bit set.
   * Use dh sequencer in rules file.
   * Use rm -f for all rm commands.
+  * Don't set {C,CPP,LD}FLAGS explicitly, already set by debhelper.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 03 Dec 2016 23:27:06 +0100
 
diff --git a/debian/rules b/debian/rules
index 3424011..e94f734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,7 @@ b := $(shell pwd)/debian
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = `dpkg-buildflags --get CFLAGS`
-CFLAGS += `dpkg-buildflags --get CPPFLAGS`
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CFLAGS += $(CPPFLAGS)
 
 SHELL		= /bin/sh -e
 CONFIGURE_OPTS	= --prefix=/usr \

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