X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=dee7db46a281615fbd70237d7609ae1ec266bf36;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=5fab6a2968d67b316a60dcb28d5b9e2b20950cc5;hpb=edc8da40fb17de047e290ed6bd819e096e435dc9;p=sbcl.git

diff --git a/install.sh b/install.sh
index 5fab6a2..dee7db4 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
@@ -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 -a $INSTALL_ROOT/bin/sbcl && \
-    cp $INSTALL_ROOT/bin/sbcl $INSTALL_ROOT/bin/sbcl.old
-test -a $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
@@ -38,8 +40,13 @@ 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
+
+. ./find-gnumake.sh
+find_gnumake
+
 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
+    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