[trigger-rally] 71/103: * remove shipped glew before calling autogen to make sure that it cannot be used during building.

[Bertrand Marc]

This is an automated email from the git hooks/post-receive script.

bbk-guest pushed a commit to branch master
in repository trigger-rally.

commit 1222812d19da011de4aa7a862b89e3cae0368f31
Author: Stefan Potyra <sistpoty at ubuntu.com>
Date:   Sat Apr 10 09:56:08 2010 +0000

    * remove shipped glew before calling autogen to make sure that
      it cannot be used during building.
---
 debian/changelog |  4 +++-
 debian/rules     | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dfd142..b8d2ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,13 @@ trigger-rally (0.5.2.1-2) UNRELEASED; urgency=low
   * debian/control: Add libglew1.5-dev to build-depends.
   * debian/patches/10_system_glew.patch: Don't link against the internal
     copy of libglew, but rather use the system libglew.
+  * debian/rules: Remove shipped copy of glew to make sure it won't get
+    used during build.
   * debian/control: Improve wording in description.
   * debian/control: Make the transitional package arch:all.
   * debian/trigger-rally.desktop: Drop catagory 3DGraphics, LP: #532067.
 
- -- Stefan Potyra <sistpoty at ubuntu.com>  Sat, 10 Apr 2010 11:27:12 +0200
+ -- Stefan Potyra <sistpoty at ubuntu.com>  Sat, 10 Apr 2010 11:41:15 +0200
 
 trigger-rally (0.5.2.1-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index b4bfd49..e7f0488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,19 @@ $(MANPAGES): $(addsuffix .sgml,$(MANPAGES))
 	docbook-to-man $< > $@
 
 configure: configure.ac
+	# make sure that the shipped glew is not used during build
+	$(RM) -r src/glew
 	./autogen.sh
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=$(DATADIR)
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" \
+		./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--datadir=$(DATADIR)
 
 
 build: build-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git