[Devil-linux-commit] build/scripts functions,1.49,1.50

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv5860/scripts

Modified Files:
	functions 
Log Message:
correctly overwrite old links and use correct path name


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- functions	14 Jan 2004 03:32:26 -0000	1.49
+++ functions	14 Jan 2004 03:54:41 -0000	1.50
@@ -416,15 +416,16 @@
 }
 
 function reset_kernel_includes () {
-	ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
-	ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
-	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
+	rm /usr/include/{linux,asm,asm-generic} || exit 1
+	ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1
+	ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
+	ln -nsf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
 }
 
 function old_kernel_includes () {
 	OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
-	ln -sf $OLDINCLUDEDIR/include/linux /usr/include/linux || exit 1
-	ln -sf $OLDINCLUDEDIR/include/asm-i386 /usr/include/asm || exit 1
-	ln -sf $OLDINCLUDEDIR/include/asm-generic /usr/include/asm-generic || exit 1
+	ln -nsf $OLDINCLUDEDIR/linux /usr/include/linux || exit 1
+	ln -nsf $OLDINCLUDEDIR/asm-i386 /usr/include/asm || exit 1
+	ln -nsf $OLDINCLUDEDIR/asm-generic /usr/include/asm-generic || exit 1
 }