mesa: Changes to 'multiarch'
debian/rules | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c8ab2a0a5c57aaed79407177e7fa6436050ec3ac
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Sun Mar 27 12:18:42 2011 -0700
further fixes to multiarch paths in the package
diff --git a/debian/rules b/debian/rules
index 417f743..dde256d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ endif
confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
- --with-dri-driverdir=/usr/lib/dri \
+ --with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='\$$$${ORIGIN}/dri' \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
@@ -205,9 +205,9 @@ build: build-stamp
build-stamp: $(BUILD_STAMPS)
# Remove gallium drivers which replace existing classic drivers.
# Intel gallium is significantly behind the classic mesa drivers...
- rm -f build/dri/lib/gallium/i915_dri.so
+ rm -f build/dri/lib/$(DEB_HOST_MULTIARCH)/gallium/i915_dri.so
# r600g is not yet in a fit state to ship
- rm -f build/dri/lib/gallium/r600_dri.so
+ rm -f build/dri/lib/$(DEB_HOST_MULTIARCH)/gallium/r600_dri.so
>$@
$(STAMP)-build-%: configure
@@ -280,7 +280,7 @@ binary-arch: install
# Classic DRI and Gallium DRI are mixed up together here
# Remove the whole tree to avoid false-positives in --list-missing, and
# install the right files manually.
- rm -r debian/tmp/dri/usr/lib/dri
+ rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
Reply to: