[Devil-linux-commit] build/scripts build-iso,1.43,1.44 cd_cleanup,1.3,1.4

[<rap...@us...>]

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

Modified Files:
	build-iso cd_cleanup 
Log Message:
using cd_cleanup

Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- build-iso	29 Oct 2003 23:11:01 -0000	1.43
+++ build-iso	30 Oct 2003 20:44:18 -0000	1.44
@@ -172,22 +172,6 @@
 		# go to the top directory of the future CD
 		pushd $CDDIR > /dev/null
 
-		# some house cleaning
-                rm $CDDIR/usr/lib/*a
-                rm -rf $CDDIR/usr/include/*
-                pushd $CDDIR/usr/bin; strip_debug ; popd
-                pushd $CDDIR/bin; strip_debug ; popd
-                pushd $CDDIR/sbin; strip_debug ; popd
-                pushd $CDDIR/usr/sbin; strip_debug ; popd
-                if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then
-                    rm -rf $CDDIR/cdtree/doc || exit 1
-                fi
-                if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then
-                    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
-	
 		echo "Creating the CD iso image, $WORKDIR/bootcd.iso... "
 		mkisofs -b boot/isolinux.bin -c boot/boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \

Index: cd_cleanup
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cd_cleanup	29 Oct 2003 23:11:01 -0000	1.3
+++ cd_cleanup	30 Oct 2003 20:44:18 -0000	1.4
@@ -37,9 +37,9 @@
 	    	    rm -rf $ISODIR/cdtree/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
 		;;