debian/rules: use dpkg-buildflags and pass to Makefile.

diff --git a/debian/changelog b/debian/changelog
index 376be02d5abb6dadee8f85032e8ef9d3a04c144a..ab7b0c3d86796721dc8c892ff469123ea1bc0cc5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ chiark-utils (4.3.0) unstable; urgency=medium
 
   Build and portability fixes:
   * Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
+  * debian/rules: use dpkg-buildflags and pass to Makefile.
   * xbatmon-simple: Saner build rune.
   * cprogs/Makefile: clean deletes $PROGRAMS
   * random-word: Some perl-mode emacs formatting glitch workarounds.

diff --git a/debian/rules b/debian/rules
index d1ec8159e94953606bd694d5de08dc8a3925b1e5..b711bb1c1a5f12c74c2960926bbab8e095370466 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,16 @@ cwd= $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 
+makebuildargs := OPTIMISE= DEBUG= \
+ CMDLINE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ CMDLINE_CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ CMDLINE_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+
 build:
        $(checkdir)
-       set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
+       set -e; for s in $(subdirs_build_arch); do \
+               $(MAKE) -C $$s all $(makebuildargs); \
+       done
        touch build
 
 build-indep: build