[SCM] Quake 3 engine branch, master, updated. 17a6fcabb9ceb603939f9e9483bb3c33b861029f

[Simon McVittie]

The following commit has been merged in the master branch:
commit 17a6fcabb9ceb603939f9e9483bb3c33b861029f
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 15 00:15:18 2010 +0100

    Do a "debug" build if DEB_BUILD_OPTIONS contains noopt, else a "release" build
    
    To facilitate that, build either flavour in build/ rather than using
    the upstream default of build/flavour-arch-os.

diff --git a/debian/ioquake3-server.install b/debian/ioquake3-server.install
index dea4828..359481f 100644
--- a/debian/ioquake3-server.install
+++ b/debian/ioquake3-server.install
@@ -1,3 +1,3 @@
 build/ioq3ded usr/lib/ioquake3
-build/release-*/baseq3/qagame*.so usr/lib/ioquake3/baseq3
-build/release-*/missionpack/qagame*.so usr/lib/ioquake3/missionpack
+build/baseq3/qagame*.so usr/lib/ioquake3/baseq3
+build/missionpack/qagame*.so usr/lib/ioquake3/missionpack
diff --git a/debian/ioquake3.install b/debian/ioquake3.install
index ecee20f..b954937 100644
--- a/debian/ioquake3.install
+++ b/debian/ioquake3.install
@@ -1,5 +1,5 @@
 build/ioquake3 usr/lib/ioquake3
-build/release-*/baseq3/cgame*.so usr/lib/ioquake3/baseq3
-build/release-*/baseq3/ui*.so usr/lib/ioquake3/baseq3
-build/release-*/missionpack/cgame*.so usr/lib/ioquake3/missionpack
-build/release-*/missionpack/ui*.so usr/lib/ioquake3/missionpack
+build/baseq3/cgame*.so usr/lib/ioquake3/baseq3
+build/baseq3/ui*.so usr/lib/ioquake3/baseq3
+build/missionpack/cgame*.so usr/lib/ioquake3/missionpack
+build/missionpack/ui*.so usr/lib/ioquake3/missionpack
diff --git a/debian/rules b/debian/rules
index 704b599..e8a0292 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,16 @@ CFLAGS += -fsigned-char
 %:
 	dh $@
 
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+TARGET = release
+else
+TARGET = debug
+endif
+
 override_dh_auto_build:
 	$(MAKE) \
+		BR=build \
+		BD=build \
 		V=1 \
 		USE_CODEC_VORBIS=1 \
 		USE_CURL=1 \
@@ -40,9 +48,10 @@ override_dh_auto_build:
 		BUILD_GAME_SO=1 \
 		BUILD_GAME_QVM=0 \
 		VERSION=$(debian_version)/$(distro) \
-		CFLAGS="$(CFLAGS)"
-	install build/release-*/ioquake3.* build/ioquake3
-	install build/release-*/ioq3ded.* build/ioq3ded
+		CFLAGS="$(CFLAGS)" \
+		$(TARGET)
+	install build/ioq3ded.* build/ioq3ded
+	install build/ioquake3.* build/ioquake3
 	sed -e s/@IOQ3BINARY@/ioquake3/ \
 		-e 's/@IOQ3SELF@/openarena/' \
 		-e 's/@IOQ3ROLE@/client/' \

-- 
Quake 3 engine