[Devil-linux-commit] build/scripts coreutils,1.8.2.1,1.8.2.2

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12464/scripts

Modified Files:
      Tag: rel-1-2-patches
	coreutils 
Log Message:
- moved the coreutils binaries to correct location
- corrected adsl init script (rp-pppoe binaries changed name from adsl-* to
pppoe-*)


Index: coreutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/coreutils,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- coreutils	23 Sep 2004 02:52:23 -0000	1.8.2.1
+++ coreutils	5 Nov 2005 20:37:48 -0000	1.8.2.2
@@ -33,23 +33,26 @@
 			done
 			touch devil-linux-patches.done
 		fi
-		./configure --prefix= --disable-nls --without-included-regex || exit 1
+		./configure --prefix=/usr --disable-nls --without-included-regex || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 		;;
 
     install )
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/bin || exit 1
-		mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-		make DESTDIR=$WORKDIR/tmp install || exit 1
-		rm $WORKDIR/tmp/bin/su
-		#rm $WORKDIR/tmp/bin/hostname
-		copy_docs $WORKDIR/tmp
-		ln -sf test $WORKDIR/tmp/bin/[
-		ln -sf /bin/env $WORKDIR/tmp/usr/bin/env
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/bin || exit 1
+		mkdir -p $TMPDIR/usr/bin || exit 1
+		make DESTDIR=$TMPDIR install || exit 1
+		mv $TMPDIR/usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} $TMPDIR/bin || exit 1
+		mv $TMPDIR/usr/bin/{date,echo,false,head,install,ln} $TMPDIR/bin || exit 1
+		mv $TMPDIR/usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} $TMPDIR/bin || exit 1
+		mv $TMPDIR/usr/bin/{sleep,stty,test,touch,true,uname} $TMPDIR/bin || exit 1
+		mv $TMPDIR/usr/bin/chroot $TMPDIR/usr/sbin
+		rm $TMPDIR/usr/bin/su
+		copy_docs $TMPDIR
+
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit
     	;;
 
     * )