From 57bf8a7e65a81a8cff946a65e7e33e3f9b948ac6 Mon Sep 17 00:00:00 2001
From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Mon, 16 Aug 2010 11:44:28 +0000
Subject: [PATCH] 1.0.41.46: further make.sh tweaks

 * Remove OpenMCL and Clisp examples from make.sh help
   string. Builders who need them should be able to figure them
   out. From the SBCL and CMUCL examples, I think -- and this way they
   won't go stale...

 * Also check for empty arguments to --foo= style command line options.
---
 make.sh           |   31 +++++++++++++++----------------
 version.lisp-expr |    2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/make.sh b/make.sh
index c60f9fa..8ab680d 100755
--- a/make.sh
+++ b/make.sh
@@ -39,13 +39,23 @@ SBCL_XC_HOST="sbcl --disable-debugger --no-userinit --no-sysinit"
 export SBCL_XC_HOST
 
 # Parse command-line options.
+function bad_option() {
+    echo $1
+    echo "Enter \"$0 --help\" for list of valid options."
+    exit 1
+}
+
 for option
 do
   # Split --foo=bar into --foo and bar.
   case $option in
       *=*)
-        optarg=`expr "X$option" : '[^=]*=\(.*\)'`
-        option=`expr "X$option" : 'X\([^=]*\)=.*'`
+        optarg=`expr "X$option" : '[^=]*=\(.*\)'` || true
+        option=`expr "X$option" : 'X\([^=]*=\).*'`
+	if test -z "$optarg"
+	then
+	    bad_option "Command-line option has no value: $option"
+	fi
 	;;
       *)
         optarg=""
@@ -55,14 +65,13 @@ do
   case $option in
       --help | -help | -h)
 	  print_help="yes" ;;
-      --prefix)
+      --prefix=)
 	  SBCL_PREFIX=$optarg ;;
-      --xc-host)
+      --xc-host=)
 	  SBCL_XC_HOST=$optarg ;;
 
   *)
-    echo "Unknown command-line option to $0: $option"
-    print_help="yes"
+    bad_option "Unknown command-line option to $0: \"$option\""
   esac
 done
 
@@ -120,16 +129,6 @@ Options:
                   Use an existing CMU CL binary as a cross-compilation
                   host when you have weird things in your .cmucl-init
                   file.
-
-       "openmcl --batch"
-                  Use an OpenMCL binary as a cross-compilation host.
-
-       "clisp"
-                  Use a CLISP binary as a cross-compilation host.
-                  Note: historically clisp hosted builds have been
-                  frequently broken. While reports of this are always
-                  appreciated, bootstrapping another host is
-                  recommended.
 EOF
   exit
 fi
diff --git a/version.lisp-expr b/version.lisp-expr
index bbc759d..2631a7b 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.41.45"
+"1.0.41.46"
-- 
1.7.10.4