[openarena] 03/11: debian/rules: simplify by building in a non-platform-specific directory

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openarena.

commit 24607c152ee98585d3f64a108d52c3a7ff69f2bc
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 2 14:32:43 2015 +0100

    debian/rules: simplify by building in a non-platform-specific directory
---
 debian/changelog |  1 +
 debian/rules     | 32 +++++++++++++++++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 844fbab..35a4fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openarena (0.8.8-15) UNRELEASED; urgency=medium
 
   * Use DEB_VENDOR instead of lsb_release
   * Drop compatibility with ioquake3 (<< 1.36+u20130504)
+  * debian/rules: simplify by building in a non-platform-specific directory
 
  -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2015 14:15:44 +0100
 
diff --git a/debian/rules b/debian/rules
index 9a873f7..eb28745 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ PRODUCT_DATE := $(shell date --utc --date="`dpkg-parsechangelog -SDate`" "+%b %_
 # the Q3 engine's build system doesn't respect CPPFLAGS, so put them in CFLAGS
 CFLAGS += $(CPPFLAGS) -fsigned-char
 
-GAME_OPTIONS = \
+common_options = \
 	V=1 \
 	BUILD_STANDALONE=1 \
 	USE_CODEC_VORBIS=1 \
@@ -45,22 +45,25 @@ 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
-GAME_OPTIONS += 'BD=$$(BR)'
 endif
 
+GAME_OPTIONS = \
+	BR=build/normal \
+	BD='$$(BR)' \
+	$(NULL)
+
 GAME_081_OPTIONS = \
-	$(GAME_OPTIONS) \
-	BUILD_DIR=build-0.8.1-compat \
-	OPENARENA_081_COMPATIBLE=1
+	BR=build/0.8.1-compat \
+	BD='$$(BR)' \
+	OPENARENA_081_COMPATIBLE=1 \
+	$(NULL)
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_build:
-	dh_auto_build -- $(GAME_OPTIONS) $(TARGET)
-	dh_auto_build -- $(GAME_081_OPTIONS) $(TARGET)
+	dh_auto_build -- $(common_options) $(GAME_OPTIONS) $(TARGET)
+	dh_auto_build -- $(common_options) $(GAME_081_OPTIONS) $(TARGET)
 	sed \
 		-e 's!@IOQ3BINARY@!ioquake3!' \
 		-e 's!@IOQ3SELF@!openarena!' \
@@ -82,7 +85,6 @@ override_dh_clean:
 override_dh_auto_clean:
 	rm -f build-stamp
 	rm -rf build
-	rm -rf build-0.8.1-compat
 	rm -f debian/openarena32.xpm
 	rm -f debian/scripts/openarena
 	rm -f debian/scripts/openarena-server
@@ -99,9 +101,9 @@ override_dh_auto_install:
 	# * one compatible with OA 0.8.1 pure servers
 	# * one compatible with OA 0.8.5 and 0.8.8 pure servers
 	# On impure servers, we default to the latest.
-	install -m644 build-0.8.1-compat/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
+	install -m644 build/0.8.1-compat/baseq3/*.so \
 		debian/tmp/usr/lib/openarena/baseoa/pak0/
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
+	install -m644 build/normal/baseq3/*.so \
 		debian/tmp/usr/lib/openarena/baseoa/pak6-patch088
 	( cd debian/tmp/usr/lib/openarena/baseoa/pak6-patch085 && \
 		ln -s ../pak6-patch088/*.so . )
@@ -109,14 +111,14 @@ override_dh_auto_install:
 		ln -s pak6-patch088/*.so . )
 	# The "mission pack" doesn't currently have incompatible versions so
 	# just use the latest
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
+	install -m644 build/normal/missionpack/*.so\
 		debian/tmp/usr/lib/openarena/missionpack/
 	# The server only needs the latest version, since it's the server
 	# that determines which version clients are expected to be
 	# compatible with
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/qagame*.so \
+	install -m644 build/normal/baseq3/qagame*.so \
 		debian/tmp/usr/lib/openarena-server/baseoa/
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/qagame*.so\
+	install -m644 build/normal/missionpack/qagame*.so\
 		debian/tmp/usr/lib/openarena-server/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
 

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