[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-3-8-ga4adf4d

[Simon McVittie]

The following commit has been merged in the master branch:
commit 2dc8b4a18db43735c39c44082ffa641de4ccf144
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Oct 11 20:53:50 2010 +0100

    debian/rules: interpret noopt as "do a debug build" which is near enough

diff --git a/debian/changelog b/debian/changelog
index 765249c..a9a6673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openarena (0.8.5-5) UNRELEASED; urgency=low
+
+  * Set up debian/rules so DEB_BUILD_OPTIONS="noopt" does a debug build
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 11 Oct 2010 19:40:30 +0100
+
 openarena (0.8.5-4) unstable; urgency=low
 
   * Build a second copy of the game logic and install it in a subdirectory.
diff --git a/debian/rules b/debian/rules
index 67adff2..71832ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,16 @@ GENERAL_OPTIONS = \
 	COMPILE_ARCH=$(Q3COMPILE_ARCH) \
 	COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM)
 
+TARGET = release
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+# near enough
+TARGET = debug
+# use the release build directory even for a debug build, it makes building
+# the package easier
+GENERAL_OPTIONS += 'BD=$$(BR)'
+endif
+
 ENGINE_OPTIONS = \
 	$(GENERAL_OPTIONS) \
 	BUILD_GAME_SO=0 \
@@ -52,9 +62,9 @@ GAME_081_OPTIONS = \
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) -C engine $(ENGINE_OPTIONS)
-	$(MAKE) -C game $(GAME_OPTIONS)
-	$(MAKE) -C game $(GAME_081_OPTIONS)
+	$(MAKE) -C engine $(ENGINE_OPTIONS) $(TARGET)
+	$(MAKE) -C game $(GAME_OPTIONS) $(TARGET)
+	$(MAKE) -C game $(GAME_081_OPTIONS) $(TARGET)
 	touch $@
 
 clean:

-- 
Packaging for the OpenArena engine