X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=5ee1c74627e183f18af8c41e2f41097fecd62bbd;hb=HEAD;hp=be855734a7a3791ff4eae6b1aa257e7396c85eef;hpb=6298c273b7c6d2b664313c03a97f3db57b9b0bde;p=sbcl.git

diff --git a/install.sh b/install.sh
index be85573..5ee1c74 100644
--- a/install.sh
+++ b/install.sh
@@ -5,24 +5,25 @@ set -e
 
 ensure_dirs ()
 {
-    for j in $*; do
-        test -d $j || mkdir -p $j
+    for j in "$@"; do
+         test -d "$j" || mkdir -p "$j"
     done;
 }
 
+. output/prefix.def
+DEFAULT_INSTALL_ROOT=$SBCL_PREFIX
+
 if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then
-    DEFAULT_INSTALL_ROOT="$PROGRAMFILES/sbcl"
     RUNTIME=sbcl.exe
     OLD_RUNTIME=sbcl.exe.old
 else
-    DEFAULT_INSTALL_ROOT=/usr/local
     RUNTIME=sbcl
     OLD_RUNTIME=sbcl.old
 fi
 INSTALL_ROOT=${INSTALL_ROOT-$DEFAULT_INSTALL_ROOT}
-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}
+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?
 if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
@@ -46,26 +47,26 @@ else
     exit 1
 fi
 
-SBCL_HOME=$INSTALL_ROOT/lib/sbcl
+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$DOC_DIR/html \
-    $BUILD_ROOT$SBCL_HOME \
-    $BUILD_ROOT$SBCL_HOME/site-systems
+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$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
 # break any running instances that have these files mapped
-test -f $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME && \
- mv $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME \
-    $BUILD_ROOT$INSTALL_ROOT/bin/$OLD_RUNTIME
-test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \
-    mv $BUILD_ROOT$SBCL_HOME/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core.old
+test -f "$BUILD_ROOT$INSTALL_ROOT"/bin/$RUNTIME && \
+ mv "$BUILD_ROOT$INSTALL_ROOT"/bin/$RUNTIME \
+    "$BUILD_ROOT$INSTALL_ROOT"/bin/$OLD_RUNTIME
+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/$RUNTIME $BUILD_ROOT$INSTALL_ROOT/bin/
-cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
+cp src/runtime/$RUNTIME "$BUILD_ROOT$INSTALL_ROOT"/bin/
+cp output/sbcl.core "$BUILD_ROOT$SBCL_HOME"/sbcl.core
 
 # installing contrib
 
@@ -74,16 +75,16 @@ sbcl_pwd
 
 SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
 SBCL_BUILDING_CONTRIB=1
-export SBCL SBCL_BUILDING_CONTRIB
+export SBCL SBCL_BUILDING_CONTRIB SBCL_PWD
 
 . ./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 `
+for i in `cd obj/asdf-cache ; echo *`; do
+    test -d obj/asdf-cache/$i && test -f obj/asdf-cache/$i/test-passed.test-report || continue;
+    INSTALL_DIR="$SBCL_HOME/contrib/"
     export INSTALL_DIR
-    ensure_dirs $BUILD_ROOT$INSTALL_DIR && $GNUMAKE -C $i install
+    ensure_dirs "$BUILD_ROOT$INSTALL_DIR" && $GNUMAKE -C contrib/$i install < /dev/null
 done
 
 echo
@@ -105,33 +106,46 @@ echo
 echo "Documentation:"
 
 # man
-cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
+cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
 
 # info
-for info in doc/manual/*.info doc/manual/*.info-*
+for info in doc/manual/*.info
+do
+  cp $info "$BUILD_ROOT$INFO_DIR"/ \
+      && BN=`basename $info` \
+      && DIRFAIL=`install-info --info-dir="$BUILD_ROOT$INFO_DIR" \
+        "$BUILD_ROOT$INFO_DIR"/$BN > /dev/null 2>&1 \
+           || echo "(could not add to system catalog)"` \
+      && echo " info $BUILD_ROOT$INFO_DIR/`basename $info` [$BUILD_ROOT$INFO_DIR/dir] $DIRFAIL"
+done
+
+for info in doc/manual/*.info-*
 do
-  cp $info $BUILD_ROOT$INFO_DIR/ \
-      && 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
+  cp $info "$BUILD_ROOT$INFO_DIR"/ \
+      && echo " info $BUILD_ROOT$INFO_DIR/`basename $info`"
 done
 
 # pdf
 for pdf in doc/manual/*.pdf
 do
-  cp $pdf $BUILD_ROOT$DOC_DIR/ \
+  cp $pdf "$BUILD_ROOT$DOC_DIR"/ \
       && echo " pdf $BUILD_ROOT$DOC_DIR/`basename $pdf`"
 done
 
 # html
 for html in doc/manual/sbcl doc/manual/asdf
 do
-  test -d $html && cp -R -L $html $BUILD_ROOT$DOC_DIR/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
+for html in doc/manual/sbcl.html doc/manual/asdf.html
+do
+  cp $html "$BUILD_ROOT$DOC_DIR"/ \
+      && echo " html $BUILD_ROOT$DOC_DIR/`basename $html`"
+done
+
+for f in BUGS CREDITS COPYING NEWS
 do
-  cp $f $BUILD_ROOT$DOC_DIR/
+  cp $f "$BUILD_ROOT$DOC_DIR"/
 done