From: Jeffrey Hutzelman <jhutz@cmu.edu>
Date: Fri, 14 Oct 2005 22:28:14 +0000 (+0000)
Subject: STABLE14-linux-objdir-kernel-builds-20051014
X-Git-Tag: openafs-stable-1_4_1-rc1~35
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3ff223aef46b2c412fcdd000281158838eb5a98b;p=packages%2Fo%2Fopenafs.git

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 e0634a799..5e5f8c461 100644
--- 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