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

diff --git a/install.sh b/install.sh
index 9722300..5ee1c74 100644
--- a/install.sh
+++ b/install.sh
@@ -10,12 +10,13 @@ ensure_dirs ()
     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
@@ -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
@@ -111,10 +112,11 @@ cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1
 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
+      && 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-*
@@ -137,7 +139,13 @@ do
       && 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"/
 done