* Support DEB_BUILD_OPTIONS=noopt in debian/rules

Author: mdz
Date: 2004-04-30 03:56:33 GMT
* Support DEB_BUILD_OPTIONS=noopt in debian/rules
(Closes: #244293)

diff --git a/debian/changelog b/debian/changelog
index 2e66ce01c95e4c4eaa735fe126ad684332ac7e0b..f67395bd21672b4396a60451ef9bd05ba1cc3dc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ apt (0.5.25) unstable; urgency=low
     (Closes: #245923)
   * Fix typo in configure-index (RecruseDepends -> RecurseDepends)
     (Closes: #246550)
+  * Support DEB_BUILD_OPTIONS=noopt in debian/rules
+    (Closes: #244293)
 
- --
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 29 Apr 2004 20:46:35 -0700
 
 apt (0.5.24) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 809e2697291c16be5bdeeeb1ff844ceb38aed22e..773b460872c774c2df12f4c6a98d8fbd604970ac 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.63 2004/02/27 00:51:25 mdz Exp $
+# $Id: rules,v 1.64 2004/04/30 03:56:33 mdz Exp $
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -27,6 +27,12 @@ endif
 # See below
 -include build/environment.mak
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  export CXXFLAGS = -O0 -g
+else
+  export CXXFLAGS = -O2 -g
+endif
+
 # Default rule
 build:
 
@@ -99,7 +105,7 @@ build/configure-stamp: configure
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
-       cd build && ../configure $(confflags)
+       cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
        touch $@
 
 build/build-stamp: build/configure-stamp