X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=clean.sh;h=540f8f966c07cbb9fcf0e72e130504d4d9f194b0;hb=eb5265ab22a2b1cae18bbdf43c871dba9b5927ea;hp=007bf3f8cbfa4c292b5a729e8af21bb7f9fe3d73;hpb=f7cadee920a6b059d17edf8d27ff92c0229a6632;p=sbcl.git

diff --git a/clean.sh b/clean.sh
index 007bf3f..540f8f9 100755
--- a/clean.sh
+++ b/clean.sh
@@ -13,7 +13,7 @@
 # this script (including "gmake clean" in the src/runtime directory)
 # several times in a row without failure.. so we leave the output/
 # directory in place.)
-rm -rf obj/* output/* doc/user-manual \
+rm -rf obj/* output/* src/runtime/genesis/ doc/user-manual \
   doc/user-manual.junk doc/DBTOHTML_OUTPUT_DIR*
 # (The doc/user-manual.junk and doc/DBTOHTML_OUTPUT_DIR* directories
 # are created by the Cygnus db2html script when it formats the the
@@ -22,17 +22,21 @@ rm -rf obj/* output/* doc/user-manual \
 # distribution, we automatically clean up after it here in the 
 # standard clean.sh file.)
 
+# Ensure we know GNUMAKE
+. ./find-gnumake.sh
+find_gnumake
+
 # Ask some other directories to clean themselves up.
 original_pwd=`pwd`
 for d in tools-for-build; do
-    cd $d > /dev/null
+    cd ./$d > /dev/null
     # I hope the -s option is standard. At least GNU make and BSD make
     # support it. It silences make, since otherwise the output from
     # this script is just the operations done by these make's, which
     # is misleading when this script does lotso other operations too.
     # -- WHN
-    make -s clean
-    cd $original_pwd  > /dev/null
+    $GNUMAKE -I ../src/runtime -s clean
+    cd $original_pwd > /dev/null
 done
 
 # Within all directories, remove things which don't look like source
@@ -69,6 +73,9 @@ done
 #   *.lisp-obj, *.fasl, *.x86f, *.axpf, *.lbytef, *.lib
 #     typical extensions for fasl files (not just from SBCL, but
 #     from other Lisp systems which might be used as xc hosts)
+#   *.tmp, *.lisp-temp
+#     conventional names for temporary files autogenerated in
+#     building or testing
 #   test-passed
 #     generated by automatic directory-test-thyself procedure
 find . \( \
@@ -104,4 +111,4 @@ find . \( \
 	-name 'test-passed' -o \
 	-name 'local-target-features.lisp-expr' \) -print | xargs rm -f
 
-cd doc && sh ./clean.sh
+cd ./doc && sh ./clean.sh