[Pkg-fglrx-devel] r695 - fglrx-driver/branches/multiarch/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-08 19:43:19 +0000 (Mon, 08 Aug 2011)
New Revision: 695

Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/rules
Log:
prepare multiarch: add _LIBDIR_ substitution

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-08 17:44:37 UTC (rev 694)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-08 19:43:19 UTC (rev 695)
@@ -3,6 +3,8 @@
   [ Andreas Beckmann ]
   * Add more copyright statements and licenses to debian/copyright.
   * Let dh_installmodules handle the modprobe blacklist config.
+  * Prepare multiarch support.
+    - Add _LIBDIR_ substitution variable.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules	2011-08-08 17:44:37 UTC (rev 694)
+++ fglrx-driver/branches/multiarch/debian/rules	2011-08-08 19:43:19 UTC (rev 695)
@@ -16,11 +16,18 @@
 lib=lib
 endif
 
+#MULTIARCH	?= yes
+libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
 
 %: %.in
-	sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g \
-	    -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+	sed -e s/_VERSION_/$(upstream_version)/g \
+	    -e s/_ARCH_/$(arch)/g \
+	    -e s/_XPIC_/$(xpic)/g \
+	    -e s/_LIB_/$(lib)/g \
+	    -e 's/_LIBDIR_/$(subst /,\/,$(libdir))/g' \
+	    < $< > $@
 
 %:
 	dh $@