rules: Actually pass CFLAGS to configure.

diff --git a/debian/changelog b/debian/changelog
index e69e8711b2135bc01fc284747b599e13f17cf244..fb7aed9ba7035703f1f998e69163a98fee5bdd49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low
     - Cleanup: There is no need to have build-arch and build-indep -
       especially if the latter is empty. Removed configure from .PHONY to
       prevent configure being called twice.
     - Cleanup: There is no need to have build-arch and build-indep -
       especially if the latter is empty. Removed configure from .PHONY to
       prevent configure being called twice.

+    - Actually pass CFLAGS to configure.

     - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary
       as well.
     - Do not manually install listtexts - the upstream build system takes care
     - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary
       as well.
     - Do not manually install listtexts - the upstream build system takes care


@@ -33,7 +34,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low
     - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and
       mlmmj-unsub manpages.
 
     - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and
       mlmmj-unsub manpages.
 

- -- Sebastian Harl <sh@tokkee.org>  Wed, 04 Mar 2009 20:29:21 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 04 Mar 2009 20:38:17 +0100

 
 mlmmj (1.2.15-1.1) unstable; urgency=low
 
 
 mlmmj (1.2.15-1.1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 53d7e50c96269a6b4189aa5c630990b6dc070cb1..7e5cac52f16e61ec9e9d0e7b60cbbd3e8e26788d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ else
 endif
 
 
 endif
 
 

-export CFLAGS = -Wall -g
+CFLAGS = -Wall -g

 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else


@@ -31,7 +31,7 @@ endif
 
 config.status: configure patch-stamp
        dh_testdir
 
 config.status: configure patch-stamp
        dh_testdir

-       ./configure $(confflags)
+       ./configure $(confflags) CFLAGS="$(CFLAGS)"

 
 build: build-stamp
 
 
 build: build-stamp