STABLE14-linux-objdir-kernel-builds-20051014

FIXES 22352

allow objdir kernel module builds to work again

(cherry picked from commit 5487535dfc97bc78755737e05757b786637f4a81)

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index e0634a799bb746dd7c014b3f04ae07c14016eb56..5e5f8c4612c7f10ad841a46b4205d3aa93340c53 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -140,15 +140,21 @@ setup:
 
 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        $(RM) -f h 
-       ln -fs ${LINUX_KERNEL_PATH}/include/linux h 
+       $(RM) -f sys
+       $(RM) -f netinet 
+       if [ -d ${LINUX_KERNEL_PATH}/include2 ] ; then                  \
+           ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux h       ; \
+           ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux sys     ; \
+           ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux netinet ; \
+       else                                                            \
+           ln -fs ${LINUX_KERNEL_PATH}/include/linux h               ; \
+           ln -fs ${LINUX_KERNEL_PATH}/include/linux sys             ; \
+           ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet         ; \
+       fi
        $(RM) -f linux 
        ln -fs ${LINUX_KERNEL_PATH}/include/linux linux 
        $(RM) -f net 
        ln -fs ${LINUX_KERNEL_PATH}/include/net net 
-       $(RM) -f netinet 
-       ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet 
-       $(RM) -f sys
-       ln -fs ${LINUX_KERNEL_PATH}/include/linux sys
        $(RM) -f asm-generic
        ln -fs ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic
        $(RM) -f asm