Bug#823632: linux-libc-dev: architecture-dependent header in non-multiarch directory

[Helmut Grohne <helmut@subdivi.de>]

Package: linux-libc-dev
Severity: wishlist
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Hi Ben et al,

While looking into bootstrapping tilegx (#823167), I noticed that linux
installs some architecture dependent headers directly into /usr/include.
Exampes include:

    /usr/include/arch/abi.h
    /usr/include/arch/opcode.h

These should be moved to /usr/include/tilegx-linux-gnu. I am attaching
an architecture-generic patch. Please consider applying it.

Helmut

--- a/debian/rules.real
+++ b/debian/rules.real
@@ -341,6 +341,8 @@
 # Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	test -d $(OUT_DIR)/include/arch && \
+		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/

 	+$(MAKE_SELF) install-base