[Pkg-virtualbox-commits] r310 - trunk/debian

[lool at alioth.debian.org]

Author: lool
Date: 2008-07-01 15:35:52 +0000 (Tue, 01 Jul 2008)
New Revision: 310

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or
lpia instead of using dpkg --print-architecture.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-01 15:32:45 UTC (rev 309)
+++ trunk/debian/changelog	2008-07-01 15:35:52 UTC (rev 310)
@@ -27,6 +27,8 @@
     for lpia.
   * Wrap uploaders, bdeps, and deps on multiple lines to get cleaner diffs.
   * Cleanup upstreamversion computation and compute it only once.
+  * Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or
+    lpia instead of using dpkg --print-architecture.
 
  -- Michael Meskes <meskes at debian.org>  Tue, 17 Jun 2008 14:52:36 +0200
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-07-01 15:32:45 UTC (rev 309)
+++ trunk/debian/rules	2008-07-01 15:35:52 UTC (rev 310)
@@ -20,6 +20,13 @@
 
 upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+VBOX_WITH_X11_ADDITIONS :=
+ifeq ($(filter-out i386 lpia,$(DEB_HOST_ARCH)),)
+VBOX_WITH_X11_ADDITIONS := 1
+endif
+
 # Generate README.Debian as text/html ...
 debian/README.Debian.html: debian/virtualbox-ose.README.Debian.xml
 	xsltproc --nonet --stringparam section.autolabel 1 \
@@ -36,11 +43,11 @@
 env.sh: patch-stamp
 	dh_testdir
 	./configure --with-linux="/usr" --disable-kmods --with-gcc=/usr/bin/gcc-4.2 --with-g++=/usr/bin/g++-4.2
-	if [ "`dpkg --print-architecture`" = "i386" ]; then \
-		echo "VBOX_WITH_X11_ADDITIONS=1" >> LocalConfig.kmk; \
-	else \
-		echo "VBOX_WITH_X11_ADDITIONS=" >> LocalConfig.kmk; \
-	fi
+ifeq ($(VBOX_WITH_X11_ADDITIONS),)
+		echo "VBOX_WITH_X11_ADDITIONS=" >>LocalConfig.kmk
+else
+		echo "VBOX_WITH_X11_ADDITIONS=1" >>LocalConfig.kmk
+endif
 
 build: build-stamp
 build-stamp: env.sh