[Devil-linux-commit] build/scripts devildoc,1.9,1.10 glibc,1.19,1.20

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

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

Modified Files:
	devildoc glibc 
Log Message:
use correct path names
some cleanup


Index: devildoc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/devildoc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- devildoc	29 Oct 2003 23:11:01 -0000	1.9
+++ devildoc	30 Oct 2003 00:02:36 -0000	1.10
@@ -48,14 +48,14 @@
 		ls -1 $DL_DIR/src > $CDDOCDIR/sources.lst || exit 1
 		cp -dp $DL_DIR/CHANGES $CDDOCDIR/ || exit 1
 		if [ "$CONFIG_DEVIL_DOC_ISO" = "y" ]; then
-			mkdir -p $ISODIR/cdtree/doc || exit 1
-			cp -dpR $CDDOCDIR/* $ISODIR/cdtree/doc || exit 1
+			mkdir -p $CDDIR/doc || exit 1
+			cp -dpR $CDDOCDIR/* $CDDIR/doc || exit 1
 		fi
 
 		if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then
-			rm -rf $ISODIR/usr/share/man/* || exit 1
-			rm -rf $ISODIR/usr/share/doc/* || exit 1
-			rm -rf $ISODIR/usr/share/info/* || exit 1
+			rm -rf $CDDIR/usr/share/man/* || exit 1
+			rm -rf $CDDIR/usr/share/doc/* || exit 1
+			rm -rf $CDDIR/usr/share/info/* || exit 1
 		fi
 		;;
 

Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- glibc	13 Oct 2003 17:36:08 -0000	1.19
+++ glibc	30 Oct 2003 00:02:36 -0000	1.20
@@ -27,10 +27,14 @@
 case $1 in
 	build )
 		tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1
-		for PATCH in $(grep -v ^# ../glibc-patches/0list)
-		do
-			sh ../glibc-patches/$PATCH.dpatch -patch $(pwd) || exit 1
-		done
+		if [ ! -f devil-linux-glibc-patches.done ]; then
+			for PATCH in $(grep -v ^# ../glibc-patches/0list)
+			do
+				echo applying patch: $PATCH
+				sh ../glibc-patches/$PATCH.dpatch -patch $(pwd) || exit 1
+			done
+			touch devil-linux-glibc-patches.done
+		fi
 		rm -rf ../glibc-build
 		mkdir ../glibc-build || exit 1
 		cd ../glibc-build || exit 1