[Pkg-lyx-devel] svn commit: r449 - in /lyx/trunk/debian: changelog rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Tue Apr 15 17:48:59 2008
New Revision: 449

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=449
Log:
Only assign CXXFLAGS if it's empty, as dpkg-buildpackage now defines
the variable for us. Don't bother with checking for noopt in
DEB_BUILD_OPTIONS, as it's deprecated.

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=449&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Tue Apr 15 17:48:59 2008
@@ -2,6 +2,9 @@
 
   [ Per Olofsson ]
   * Add writer2latex and latex2rtf to Suggests (found in configure.py).
+  * Only assign CXXFLAGS if it's empty, as dpkg-buildpackage now defines
+    the variable for us. Don't bother with checking for noopt in
+    DEB_BUILD_OPTIONS, as it's deprecated.
 
   [ Sven Hoexter ]
   * Add bash_completion and install it as /etc/bash_completion.d/lyx.

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=449&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Tue Apr 15 17:48:59 2008
@@ -29,13 +29,7 @@
 	--without-included-gettext \
 	--without-included-boost \
 
-CXXFLAGS += -g
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O2
-else
-	CXXFLAGS += -O0
-endif
+CXXFLAGS ?= -g -O2
 
 ifeq ($(DEB_HOST_ARCH),hppa)
 	CXXFLAGS += -ffunction-sections