debian/rules: Use /usr/share/dpkg/{architecture,buildflags}.mk.

Delegate dpkg-{architecture,buildflags} calls to
/usr/share/dpkg/{architecture,buildflags}.mk respectively.

diff --git a/debian/changelog b/debian/changelog
index 96338ceacfeffb833eb06b806f439f8c0daf5431..9c0df93d13bde0ba7c2547778e38006f2b3171d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ncbi-blast+ (2.9.0-2) UNRELEASED; urgency=medium
 
   * NOT RELEASED YET.
+  * debian/rules: Delegate dpkg-{architecture,buildflags} calls to
+    /usr/share/dpkg/{architecture,buildflags}.mk respectively.
 
- -- Aaron M. Ucko <ucko@debian.org>  Sun, 29 Sep 2019 15:37:26 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 29 Sep 2019 15:40:25 -0400
 
 ncbi-blast+ (2.9.0-1) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index 00976d24b3fd1b478725c0119f8e655bf69a8262..95cbb7515ac29cbdce6f7d1ee4656e9b84352219 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,12 +26,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEB_CFLAGS_MAINT_APPEND=-Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildflags.mk
 
-CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+LDFLAGS += -Wl,--as-needed
 
 ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
 CXXFLAGS := $(CXXFLAGS:-O%=-O)