X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=4f9383750b1d209907db53dd50ad867bc62ae3bb;hb=40bf78b47ea89b15698adb9c550efa4cbacafeb7;hp=d14ddc1e31a1c8ae654ed8bb2670b5bb068766d0;hpb=cec71f1e4e1ead387f2ea642f760e553b6053f2b;p=sbcl.git

diff --git a/install.sh b/install.sh
index d14ddc1..4f93837 100644
--- a/install.sh
+++ b/install.sh
@@ -22,12 +22,14 @@ SBCL_HOME=$INSTALL_ROOT/lib/sbcl
 export SBCL_HOME
 ensure_dirs $INSTALL_ROOT $INSTALL_ROOT/bin $INSTALL_ROOT/lib \
     $INSTALL_ROOT/man $INSTALL_ROOT/man/man1 \
-    $SBCL_HOME $SBCL_HOME/systems
+    $SBCL_HOME $SBCL_HOME/systems $SBCL_HOME/site-systems
 
-test -e $INSTALL_ROOT/bin/sbcl && \
-    cp $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old
-test -e $SBCL_HOME/sbcl.core && \
-    cp $SBCL_HOME/sbcl.core $SBCL_HOME/sbcl.core.old
+# move old versions out of the way.  Safer than copying: don't want to
+# break any running instances that have these files mapped
+test -f $INSTALL_ROOT/bin/sbcl && \
+    mv $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old
+test -f $SBCL_HOME/sbcl.core && \
+    mv $SBCL_HOME/sbcl.core $SBCL_HOME/sbcl.core.old
 
 cp src/runtime/sbcl $INSTALL_ROOT/bin/
 cp output/sbcl.core $SBCL_HOME/sbcl.core
@@ -41,7 +43,8 @@ export SBCL SBCL_BUILDING_CONTRIB
 
 gnumake=${GNUMAKE:-gmake}
 for i in contrib/*; do
-    test -d $i && test -e $i/Makefile || continue;
-    export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    $gnumake -C $i test && ensure_dirs $INSTALL_DIR && $gnumake -C $i install
+    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
 done