[Pkg-fglrx-devel] r678 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Sat Aug 6 22:05:21 UTC 2011
Author: anbe-guest
Date: 2011-08-06 22:05:21 +0000 (Sat, 06 Aug 2011)
New Revision: 678
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/rules
Log:
use DEB_HOST_ARCH instead of DEB_BUILD_ARCH and initialize it
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-08-06 21:59:43 UTC (rev 677)
+++ fglrx-driver/trunk/debian/changelog 2011-08-06 22:05:21 UTC (rev 678)
@@ -16,7 +16,7 @@
* Do not install duplicate copies of the Xorg modules. (Closes: #636450)
* Keep upstream's names of fglrx-libGL.so.1.2 and fglrx-libglx.so, add or
adjust symlinks instead.
- * Simplify and reorder debian/rules.
+ * Simplify and reorder debian/rules. Use DEB_HOST_* instead of DEB_BUILD_*.
-- Andreas Beckmann <debian at abeckmann.de> Thu, 04 Aug 2011 23:42:27 +0200
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-08-06 21:59:43 UTC (rev 677)
+++ fglrx-driver/trunk/debian/rules 2011-08-06 22:05:21 UTC (rev 678)
@@ -3,6 +3,9 @@
packagename=$(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: (.*)/\1/p')
upstream_version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
INSTALLER=ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
@@ -10,7 +13,7 @@
CACHEDIR=/tmp
endif
-ifeq ($(DEB_BUILD_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),amd64)
arch=x86_64
xpic=xpic_64a
lib=lib64
More information about the Pkg-fglrx-devel
mailing list