Fix for 322610:

- added m68 to headers_dirs on powepc.
 - changed Makefile to pass headers_dirs to post-install.
 - changed post-install to add links to all headers
   directories, specified in headers_dirs.

svn path=/trunk/kernel/source/linux-2.6/; revision=3851

debian/Makefile

@@ -159,6 +159,7 @@ post-install-$(subarch): templates/post-install.in
 	sed -e 's,@initrd_modules@,$(initrd_modules),'			\
 	    -e 's,@append_subarch@,$(append),'				\
 	    -e 's,@extra_postinstall_command@,$(extra_command),'	\
+	    -e 's,@headers_dirs@,$(headers_dirs),'			\
 	    templates/post-install.in > post-install-$(subarch)
 #
 # Generates the kernel config file for a subarch by merging

debian/arch/powerpc/Makefile.inc

@@ -1,6 +1,6 @@
 #
 # Variables 
 #
-headers_dirs = ppc | ppc64
+headers_dirs = ppc | ppc64 | m68k
 headers_subarch = powerpc
 build_subarch = powerpc

debian/templates/post-install.in

@@ -79,6 +79,21 @@ find . -mindepth 1 -maxdepth 1 \
 	xargs ln -s --target-directory=$dir/include
 cp -a config $dir/include
 ln -sf asm-${arch} $dir/include/asm
+# Link in the additional header directories, 
+# specified in header_dirs 
+for i in asm-*
+do
+  case ${i#asm-} in
+      generic | @headers_dirs@)
+        if [ ! -L $dir/include/${i} ]; then
+          ln -sf ../../linux-headers-$prefix/include/${i} $dir/include/${i}
+	fi
+	;;
+      *)
+        ;;
+  esac
+done
+
 find linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
 	-printf "../../../linux-headers-$prefix/include/linux/%f\n" |