make.sh --help no longer runs clean.sh

Fixes lp#937001

diff --git a/NEWS b/NEWS
index e4aa65e..13036cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ changes relative to sbcl-1.1.2:
     (lp#727625)
   * bug fix: fasls are now once again directly executable (on platforms
     supporting shebang lines, with a suitably-installed sbcl).
+  * bug fix: make.sh --help no longer runs clean.sh. (lp#937001)
 
 changes in sbcl-1.1.2 relative to sbcl-1.1.1:
   * notice: System requirements for SBCL on Microsoft Windows: Windows NT 5.1

diff --git a/make-config.sh b/make-config.sh
index 1b86204..1a0a547 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -208,6 +208,10 @@ EOF
   exit 1
 fi
 
+# Running make.sh with different options without clean.sh in the middle
+# can break things.
+sh clean.sh
+
 mkdir -p output
 # Save prefix for make and install.sh.
 echo "SBCL_PREFIX='$SBCL_PREFIX'" > output/prefix.def

diff --git a/make.sh b/make.sh
index 77494c6..f10db34 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -20,10 +20,6 @@ export LANG LC_ALL
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-# Running make.sh with different options without clean.sh in the middle
-# can break things.
-sh clean.sh
-
 # If you're cross-compiling, make-config.sh should "do the right
 # thing" when run on the target machine, with the minor caveat that
 # any --xc-host parameter should be suitable for the host machine