X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=5676daebcc89c63a3f6276a618af43aa1ea293cb;hb=feba3c704ebcf93a3351422fcc6cf8fa60b2637e;hp=0265a4d2ac543e1bd32dfb8b64548b50b1c9eaa6;hpb=2e8a905fd4557c672f434a109b2e7bde0621fb29;p=sbcl.git

diff --git a/install.sh b/install.sh
index 0265a4d..5676dae 100644
--- a/install.sh
+++ b/install.sh
@@ -5,20 +5,18 @@ set -e
 
 ensure_dirs ()
 {
-    OLD_IFS=$IFS
-    IFS=''
-    for j in $*; do
+    for j in "$@"; do
          test -d "$j" || mkdir -p "$j"
     done;
-    IFS=$OLD_IFS
 }
 
+. 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
@@ -111,15 +109,22 @@ echo "Documentation:"
 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"/ \
       && 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 \
+      && ( install-info --info-dir="$BUILD_ROOT$INFO_DIR" \
+        "$BUILD_ROOT$INFO_DIR"/`basename $info` > /dev/null 2>&1 \
            || echo -n " (could not add to system catalog)" ) \
       && echo
 done
 
+for info in doc/manual/*.info-*
+do
+  cp $info "$BUILD_ROOT$INFO_DIR"/ \
+      && echo " info $BUILD_ROOT$INFO_DIR/`basename $info`"
+done
+
 # pdf
 for pdf in doc/manual/*.pdf
 do
@@ -134,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