X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=a2399f00ece9b29dd97e2c1e471334bc89709814;hb=d5d5103a4c3563ffb02ccf45cc4fdaa02ad13e75;hp=913276c13b993c36960bf4d7ed07eb94204f515d;hpb=e583bce51c0f1b1b453b73a4edf3c35d0185e66f;p=sbcl.git

diff --git a/install.sh b/install.sh
index 913276c..a2399f0 100644
--- a/install.sh
+++ b/install.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
+set -e
 
 # Install SBCL files into the usual places.
 
-ensure_dirs () 
+ensure_dirs ()
 {
-    for j in $*; do 
-	test -d $j || mkdir -p $j
+    for j in $*; do
+        test -d $j || mkdir -p $j
     done;
 }
 
@@ -14,6 +15,7 @@ MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
 INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
 DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
 
+# Does the environment look sane?
 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.
@@ -22,13 +24,28 @@ if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME="$SBCL_HOME"
    exit 1
 fi
+
+# Before doing anything else, make sure we have an SBCL to install
+if [ -f src/runtime/sbcl ]; then
+    if [ -f output/sbcl.core ]; then
+        true
+    else
+        echo "output/sbcl.core not found, aborting installation."
+        exit 1
+    fi
+else
+    echo "src/runtime/sbcl not found, aborting installation."
+    exit 1
+fi
+
 SBCL_HOME=$INSTALL_ROOT/lib/sbcl
 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$INFO_DIR $BUILD_ROOT$DOC_DIR \
-    $BUILD_ROOT$SBCL_HOME $BUILD_ROOT$SBCL_HOME/systems \
+    $BUILD_ROOT$DOC_DIR/html \
+    $BUILD_ROOT$SBCL_HOME \
     $BUILD_ROOT$SBCL_HOME/site-systems
 
 # move old versions out of the way.  Safer than copying: don't want to
@@ -41,7 +58,7 @@ test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \
 cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/
 cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
 
-# installing contrib 
+# installing contrib
 
 SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
 SBCL_BUILDING_CONTRIB=1
@@ -82,8 +99,8 @@ cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/s
 for info in doc/manual/*.info
 do
   cp $info $BUILD_ROOT$INFO_DIR/ \
-      && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info`" \
-      && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` > /dev/null 2>&1 \
+      && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir" \
+      && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir > /dev/null 2>&1 \
            || echo -n " (could not add to system catalog)" ) \
       && echo
 done
@@ -98,8 +115,8 @@ done
 # html
 for html in doc/manual/sbcl doc/manual/asdf
 do
-  test -d $html && cp -r $html $BUILD_ROOT$DOC_DIR/`basename $html` \
-      && echo " html $BUILD_ROOT$DOC_DIR/`basename $html`/index.html"
+  test -d $html && cp -R -L $html $BUILD_ROOT$DOC_DIR/html \
+      && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html"
 done
 
 for f in BUGS SUPPORT CREDITS COPYING NEWS