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

diff --git a/install.sh b/install.sh
index d14ddc1..a2d30fd 100644
--- a/install.sh
+++ b/install.sh
@@ -5,11 +5,12 @@
 ensure_dirs () 
 {
     for j in $*; do 
-	test -d $j || mkdir $j
+	test -d $j || mkdir -p $j
     done;
 }
 
 INSTALL_ROOT=${INSTALL_ROOT-/usr/local}
+MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
 SBCL_SOURCE=`pwd`
 if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
@@ -19,19 +20,23 @@ if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    exit 1
 fi
 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
-
-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
-
-cp src/runtime/sbcl $INSTALL_ROOT/bin/
-cp output/sbcl.core $SBCL_HOME/sbcl.core
-cp doc/sbcl.1 $INSTALL_ROOT/man/man1/
+export SBCL_HOME INSTALL_ROOT
+ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \
+    $BUILD_ROOT$INSTALL_ROOT/lib  \
+    $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \
+    $BUILD_ROOT$SBCL_HOME $BUILD_ROOT$SBCL_HOME/systems \
+    $BUILD_ROOT$SBCL_HOME/site-systems
+
+# 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 $BUILD_ROOT$INSTALL_ROOT/bin/sbcl && \
+    mv $BUILD_ROOT$INSTALL_ROOT/bin/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/sbcl.old
+test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \
+    mv $BUILD_ROOT$SBCL_HOME/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core.old
+
+cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/
+cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
+cp doc/sbcl.1 doc/sbcl-asdf-install.1 $BUILD_ROOT$MAN_DIR/man1/
 
 # installing contrib 
 
@@ -39,9 +44,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 -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 $BUILD_ROOT$INSTALL_DIR && $GNUMAKE -C $i install
 done