From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 24 Apr 2001 03:48:32 +0000 (+0000)
Subject: linux-make-bridge-script-more-respectful-of-build-environment-20010423
X-Git-Tag: openafs-stable-1_1_0~184
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c1f5a932d1cb274ac0ca6ca29f2175e0547a2bcf;p=packages%2Fo%2Fopenafs.git

linux-make-bridge-script-more-respectful-of-build-environment-20010423


make it actually use the known path to the kernel source, and check for existance before doing anything
---

diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX
index fec7620db..194dedb0c 100644
--- a/src/libafs/MakefileProto.LINUX
+++ b/src/libafs/MakefileProto.LINUX
@@ -92,7 +92,7 @@ setup:
 			ln -fs ../Makefile $${KDIR}/Makefile ; \
 			ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
 <i386_linux22 i386_linux24>
-			sh ./redhat.sh ${LINUX_VERS} $${KDIR}/Makefile.extradefs; \
+			sh ./redhat.sh ${LINUX_SRCDIR}$$v $${KDIR}/Makefile.extradefs; \
 <all>
 		done \
 	done
diff --git a/src/libafs/redhat.sh b/src/libafs/redhat.sh
index 0d35c2a09..e213cc9cc 100755
--- a/src/libafs/redhat.sh
+++ b/src/libafs/redhat.sh
@@ -5,15 +5,20 @@
 IBYTES=""
 SETATTR=""
 
-grep i_bytes /lib/modules/$1/build/include/linux/fs.h > /dev/null
+if [ -e $1/include/linux/fs.h ] ; then
+grep i_bytes $1/include/linux/fs.h > /dev/null
 if [ $? = 0 ]; then
-    IBYTES="-DSTRUCT_INODE_HAS_I_BYTES=1"
+IBYTES="-DSTRUCT_INODE_HAS_I_BYTES=1"
 fi
-grep "extern int inode_setattr" /lib/modules/$1/build/include/linux/fs.h > /dev/null
+
+grep "extern int inode_setattr" $1/include/linux/fs.h > /dev/null
 if [ $? = 0 ]; then
-    SETATTR="-DINODE_SETATTR_NOT_VOID=1"
+SETATTR="-DINODE_SETATTR_NOT_VOID=1"
 fi
 
+if [ -e $2 ] ; then
 /bin/rm $2
+fi
 echo "KDEFINES = ${IBYTES} ${SETATTR}" > $2
+fi
 exit 0