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

[pelle at users.alioth.debian.org]

Author: pelle
Date: Thu Oct 25 18:18:34 2007
New Revision: 383

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=383
Log:
* CFLAGS -> CXXFLAGS in debian/rules.

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=383&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 25 18:18:34 2007
@@ -6,8 +6,9 @@
   * Call dh_icons so icon cache is updated. Build-dep on debhelper 5.0.51.
   * Recommend evince as PS/PDF viewer. It's quite good, and KDE users
     will already have alternatives installed.
-
- -- Per Olofsson <pelle at debian.org>  Sun, 21 Oct 2007 17:06:59 +0200
+  * CFLAGS -> CXXFLAGS in debian/rules.
+
+ -- Per Olofsson <pelle at debian.org>  Thu, 25 Oct 2007 20:18:04 +0200
 
 lyx (1.5.1-2) unstable; urgency=low
 

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=383&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Thu Oct 25 18:18:34 2007
@@ -30,16 +30,16 @@
 	--without-included-gettext \
 	--without-included-boost \
 
-CFLAGS += -g
+CXXFLAGS += -g
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O2
+	CXXFLAGS += -O2
 else
-	CFLAGS += -O0
+	CXXFLAGS += -O0
 endif
 
 ifeq ($(DEB_HOST_ARCH),hppa)
-	CFLAGS += -ffunction-sections
+	CXXFLAGS += -ffunction-sections
 endif
 
 LDFLAGS += -Wl,--as-needed
@@ -59,7 +59,7 @@
 		|| ln -s /usr/share/misc/config.guess config/config.guess
 
 	test -d build-tree || mkdir build-tree
-	cd build-tree && CXXFLAGS="$(CFLAGS)" \
+	cd build-tree && CXXFLAGS="$(CXXFLAGS)" \
 		LDFLAGS="$(LDFLAGS)" ../configure $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp