0.8.3.18:

[sbcl.git] / install.sh

diff --git a/install.sh b/install.sh
index 4f93837..50c66b6 100644 (file)
--- a/install.sh
+++ b/install.sh
@@ -19,7 +19,7 @@ if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    exit 1
 fi
 SBCL_HOME=$INSTALL_ROOT/lib/sbcl
-export SBCL_HOME
+export SBCL_HOME INSTALL_ROOT
 ensure_dirs $INSTALL_ROOT $INSTALL_ROOT/bin $INSTALL_ROOT/lib \
     $INSTALL_ROOT/man $INSTALL_ROOT/man/man1 \
     $SBCL_HOME $SBCL_HOME/systems $SBCL_HOME/site-systems
@@ -41,10 +41,12 @@ SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
-gnumake=${GNUMAKE:-gmake}
+. ./find-gnumake.sh
+find_gnumake
+
 for i in contrib/*; do
     test -d $i && test -f $i/test-passed || continue;
     INSTALL_DIR=$SBCL_HOME/`basename $i `
     export INSTALL_DIR
-    ensure_dirs $INSTALL_DIR && $gnumake -C $i install
+    ensure_dirs $INSTALL_DIR && $GNUMAKE -C $i install
 done