debian/rules: Honour dpkg-buildflags.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 547cdcd03064850adb433055e073008744cc69a0..88016cc00af648441954bfcd734c6acabcab007f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ userv (1.1.2~~iwj1) unstable; urgency=low
   * Honour XCFLAGS.
 
   Debian packaging:
   * Honour XCFLAGS.
 
   Debian packaging:

+  * Honour dpkg-buildflags.

   * Add some newer debian/ droppings to .gitignore.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Dec 2013 17:39:11 +0000
   * Add some newer debian/ droppings to .gitignore.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Dec 2013 17:39:11 +0000

diff --git a/debian/rules b/debian/rules
index 97bced17663819ef0f28f733e85f03d7059df542..67c5271261ee8be0febdcd6e932fbacf9331527b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,17 @@ else
        INSTOPTS= INSTALL_PROGRAM='install -c'
 endif
 
        INSTOPTS= INSTALL_PROGRAM='install -c'
 endif
 

+makebuildargs := OPTIMISE= \
+ XCFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ XCPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ XLDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+

 build: build-arch build-indep
 
 build-arch:
        $(checkdir)
        ./configure --prefix=/usr
 build: build-arch build-indep
 
 build-arch:
        $(checkdir)
        ./configure --prefix=/usr

-       $(MAKE) all docs
+       $(MAKE) $(makebuildargs) all docs

        touch build-arch
 
 clean:
        touch build-arch
 
 clean:


@@ -40,7 +45,7 @@ binary-arch:  checkroot build
        install -m 755 debian/{postinst,prerm,postrm} $t/DEBIAN/.
        install -m 644 debian/conffiles $t/DEBIAN/.
        install -m 755 debian/initd $t/etc/init.d/userv
        install -m 755 debian/{postinst,prerm,postrm} $t/DEBIAN/.
        install -m 644 debian/conffiles $t/DEBIAN/.
        install -m 755 debian/initd $t/etc/init.d/userv

-       $(MAKE) $(INSTOPTS) \
+       $(MAKE) $(INSTOPTS) $(makebuildargs) \

                prefix=$t/usr etcdir=$t/etc \
                docdir=$t/usr/share/doc/userv \
                mandir=$t/usr/share/man \
                prefix=$t/usr etcdir=$t/etc \
                docdir=$t/usr/share/doc/userv \
                mandir=$t/usr/share/man \