X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=install.sh;h=9a02a511dd2a49c72f26d61e7db9a9dee45aa6e8;hb=98f3f617894ce24a40764aa98606ce68c5482cf0;hp=5fab6a2968d67b316a60dcb28d5b9e2b20950cc5;hpb=edc8da40fb17de047e290ed6bd819e096e435dc9;p=sbcl.git

diff --git a/install.sh b/install.sh
index 5fab6a2..9a02a51 100644
--- a/install.sh
+++ b/install.sh
@@ -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 @@ ensure_dirs $INSTALL_ROOT $INSTALL_ROOT/bin $INSTALL_ROOT/lib \
     $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 @@ cp doc/sbcl.1 $INSTALL_ROOT/man/man1/
 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;
     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 && make -C $i install
 done