just in case: correct the header-guard for https to not match http

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 4ef5bb47aa4f85f5250d94e2dfa0215b975aa075..9eda3a8fa0056f8cef5c827f7ea69a5b4ff5f0cc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ endif
 
 ifneq (,$(shell which dpkg-buildflags))
   export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
 
 ifneq (,$(shell which dpkg-buildflags))
   export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)

+  export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+  export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)

 else
   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     export CXXFLAGS = -O0 -g -Wall
 else
   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     export CXXFLAGS = -O0 -g -Wall


@@ -92,7 +94,7 @@ build/configure-stamp: configure
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright

-       cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
+       cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)

        touch $@
 
 build/build-stamp: build/configure-stamp
        touch $@
 
 build/build-stamp: build/configure-stamp