rules: Pass CFLAGS as arguments to configure.

... instead of setting them in the environment - this is the recommended way.

diff --git a/debian/changelog b/debian/changelog
index 3bf7132fbcdc9ecbe0a038b3c1757d3fd697d3d0..e59259f4a3b03d675371b005809ecaa6f889f3ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ ncmpc (0.14-1) unstable; urgency=low
     - Updated from deprecated version 4 to the now recommended version 7.
   * debian/rules:
     - Use dh_prep instead of the deprecated dh_clean -k.
     - Updated from deprecated version 4 to the now recommended version 7.
   * debian/rules:
     - Use dh_prep instead of the deprecated dh_clean -k.

+    - Pass CFLAGS as arguments to configure instead of setting them in the
+      environment - this is the recommended way.

 
 

- -- Sebastian Harl <tokkee@debian.org>  Sat, 06 Jun 2009 20:06:42 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 06 Jun 2009 20:19:58 +0200

 
 ncmpc (0.13-1) experimental; urgency=low
 
 
 ncmpc (0.13-1) experimental; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 7399bd58eef8986c0ff3165c31538ed2e5abf0ae..36f2d5b2bdd82ba84bdbc586cd3a2dfca394a073 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ endif
 
 config.status: configure
        dh_testdir
 
 config.status: configure
        dh_testdir

-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+       ./configure --host=$(DEB_HOST_GNU_TYPE) \

                        --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
                        --mandir=\$${prefix}/share/man \
                        --disable-mini \
                        --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
                        --mandir=\$${prefix}/share/man \
                        --disable-mini \


@@ -39,7 +39,8 @@ config.status: configure
                        --enable-key-screen \
                        --enable-lyrics-screen \
                        --enable-outputs-screen \
                        --enable-key-screen \
                        --enable-lyrics-screen \
                        --enable-outputs-screen \

-                       --with-ncursesw
+                       --with-ncursesw \
+                       CFLAGS="$(CFLAGS)"

 
 build: build-stamp
 
 
 build: build-stamp