[openarena] 04/11: debian/rules: rely on a q3arch version that accepts command-lines like "q3arch make i386 linux-gnu", to avoid repeated invocation

[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 8153a00d7139352e7ca671b1312e9057efcb2feb
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 2 14:36:17 2015 +0100

    debian/rules: rely on a q3arch version that accepts command-lines like "q3arch make i386 linux-gnu", to avoid repeated invocation
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 9 +--------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35a4fc3..f9cc21a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ 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
+  * debian/rules: rely on a q3arch version that accepts command-lines like
+    "q3arch make i386 linux-gnu", to avoid repeated invocation
 
  -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2015 14:15:44 +0100
 
diff --git a/debian/control b/debian/control
index 70114db..15641b2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                imagemagick,
-               ioquake3-server (>= 1.36+svn1802-1~),
+               ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/openarena.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena.git/
diff --git a/debian/rules b/debian/rules
index eb28745..731158c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,6 @@ export TZ=UTC
 
 include /usr/share/dpkg/default.mk
 
-Q3ARCH             := $(shell /usr/share/ioquake3/q3arch arch     HOST)
-Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch platform HOST)
-Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch arch     BUILD)
-Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch platform BUILD)
 PRODUCT_DATE := $(shell date --utc --date="`dpkg-parsechangelog -SDate`" "+%b %_d %Y")
 
 # the Q3 engine's build system doesn't respect CPPFLAGS, so put them in CFLAGS
@@ -27,10 +23,7 @@ common_options = \
 	USE_INTERNAL_SPEEX=0 \
 	USE_INTERNAL_ZLIB=0 \
 	USE_LOCAL_HEADERS=0 \
-	ARCH=$(Q3ARCH) \
-	PLATFORM=$(Q3PLATFORM) \
-	COMPILE_ARCH=$(Q3COMPILE_ARCH) \
-	COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM) \
+	$(shell /usr/share/ioquake3/q3arch make ${DEB_HOST_GNU_CPU} ${DEB_HOST_GNU_SYSTEM}) \
 	SDL_CFLAGS= \
 	BUILD_CLIENT=0 \
 	BUILD_SERVER=0 \

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