[kernel] r17898 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Tue Aug  9 04:02:12 2011
New Revision: 17898

Log:
Fix multi-arch header directory as explained by Aurelien

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Aug  9 00:16:15 2011	(r17897)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug  9 04:02:12 2011	(r17898)
@@ -4,8 +4,9 @@
   * Add configuration files for s390x architecture.
 
   [ Ben Hutchings ]
-  * linux-libc-dev: Install include/asm under arch-specific directory;
-    mark package as multi-arch-coinstallable (Multi-Arch: same)
+  * linux-libc-dev: Install include/asm under arch-specific directory
+    (thanks to Aurelien for correcting the directory); mark package as
+    multi-arch-coinstallable (Multi-Arch: same)
   * [powerpc] Use libata-based drivers for most PATA controllers
     (Closes: #636854):
     - Various drivers replaced as for x86 in 2.6.32-10

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Tue Aug  9 00:16:15 2011	(r17897)
+++ dists/sid/linux-2.6/debian/rules.real	Tue Aug  9 04:02:12 2011	(r17898)
@@ -8,6 +8,7 @@
 SHELL  := bash -e
 DEB_HOST_ARCH     := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
 UPLOADER  := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
 
@@ -310,8 +311,8 @@
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
 
 	# Move include/asm to arch-specific directory
-	mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
-	mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
+	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
+	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 	
 	+$(MAKE_SELF) install-base