[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.2-1-7-g1ab19f3

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 1ab19f35e2497854a4acd743d052028cbcdacc15
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Mon Jul 5 14:36:07 2010 +0200

    Fix flags handover through autogen.sh

diff --git a/debian/rules b/debian/rules
index 4875acd..637231f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ endif
 ## used for package name extension
 BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
 
-CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
 
 
 include /usr/share/quilt/quilt.make
@@ -71,7 +71,7 @@ clean:
 
 configure: configure-stamp patch
 configure-stamp:
-	./autogen.sh $(CONFIGURE_SWITCHES)
+	 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
 	touch $@
 
 

-- 
Debian packaging of wesnoth