r10912 - packages/trunk/trigger/debian

[Stefan Potyra]

Author: sistpoty-guest
Date: 2010-04-10 09:56:08 +0000 (Sat, 10 Apr 2010)
New Revision: 10912

Modified:
   packages/trunk/trigger/debian/changelog
   packages/trunk/trigger/debian/rules
Log:
* remove shipped glew before calling autogen to make sure that 
  it cannot be used during building.


Modified: packages/trunk/trigger/debian/changelog
===================================================================
--- packages/trunk/trigger/debian/changelog	2010-04-10 09:38:27 UTC (rev 10911)
+++ packages/trunk/trigger/debian/changelog	2010-04-10 09:56:08 UTC (rev 10912)
@@ -18,11 +18,13 @@
   * 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
 

Modified: packages/trunk/trigger/debian/rules
===================================================================
--- packages/trunk/trigger/debian/rules	2010-04-10 09:38:27 UTC (rev 10911)
+++ packages/trunk/trigger/debian/rules	2010-04-10 09:56:08 UTC (rev 10912)
@@ -29,11 +29,19 @@
 	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