[DebianGIS-dev] r1665 - packages/mapserver/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-06-23 20:02:08 +0000 (Mon, 23 Jun 2008)
New Revision: 1665

Modified:
   packages/mapserver/trunk/debian/rules
Log:
Using internal vars for CFLAGS and CXXFLAGS


Modified: packages/mapserver/trunk/debian/rules
===================================================================
--- packages/mapserver/trunk/debian/rules	2008-06-23 15:19:39 UTC (rev 1664)
+++ packages/mapserver/trunk/debian/rules	2008-06-23 20:02:08 UTC (rev 1665)
@@ -20,9 +20,6 @@
 
 AGG=agg-2.4
 
-# Turning off optimization due to issue with gcc 4.3 (see #487679)
-CFLAGS="-g -O0"
-CXXFLAGS="$(CFLAGS)"
 
 # Configure config :
 # Not using non free libpdf
@@ -73,9 +70,13 @@
 
 	touch build-agg-stamp
 
+# Turning off optimization due to issue with gcc 4.3 (see #487679)
+MS_CFLAGS=-g -O0
+MS_CXXFLAGS=$(MS_CFLAGS)
+
 configure-stamp: patch build-agg-stamp
 	dh_testdir
-	./configure $(COMMON_CONFIG) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+	./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
 
 
 	touch configure-stamp
@@ -83,7 +84,7 @@
 configure-php5-stamp: patch clean-first-build
 	dh_testdir
 	./configure $(COMMON_CONFIG) \
-		--with-php=/usr/include/php5  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+		--with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
 
 	touch configure-php5-stamp