[Sbcl-devel] install.sh / GNU Make / bash, take 2

[Raymond W. <Ray...@fa...>]

        I missed out that there were two calls to (gnu)make in
install.sh. Also, in my checked-out version of sbcl, there is an empty
subtree sbc-aclrep (presumably the result of a keyboarding
misadventure :-) Adding an explicit check for a Makefile and not just
a directory solves this.

        Revised patch:

Index: install.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/install.sh,v
retrieving revision 1.3
diff -u -r1.3 install.sh
--- install.sh  7 Feb 2003 02:11:10 -0000       1.3
+++ install.sh  10 Feb 2003 15:27:39 -0000
@@ -2,7 +2,7 @@
 
 # Install SBCL files into the usual places.
 
-function ensure_dirs () 
+ensure_dirs () 
 {
     for j in $*; do 
        test -d $j || mkdir $j
@@ -24,9 +24,9 @@
     $INSTALL_ROOT/man $INSTALL_ROOT/man/man1 \
     $SBCL_HOME $SBCL_HOME/systems
 
-test -a $INSTALL_ROOT/bin/sbcl && \
+test -e $INSTALL_ROOT/bin/sbcl && \
     cp $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old
-test -a $SBCL_HOME/sbcl.core && \
+test -e $SBCL_HOME/sbcl.core && \
     cp $SBCL_HOME/sbcl.core $SBCL_HOME/sbcl.core.old
 
 cp src/runtime/sbcl $INSTALL_ROOT/bin/
@@ -38,8 +38,10 @@
 SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
+
+gnumake=${GNUMAKE:-gmake}
 for i in contrib/*; do
-    test -d $i || continue;
+    test -d $i && test -e $i/Makefile || continue;
     export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    make -C $i test && ensure_dirs $INSTALL_DIR && make -C $i install
+    $gnumake -C $i test && ensure_dirs $INSTALL_DIR && $gnumake -C $i install
 done