Index: install.sh =================================================================== --- install.sh +++ install.sh 2012-01-12 10:00:56.014787054 +0100 @@ -24,9 +24,10 @@ 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} +LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib} # Does the environment look sane? -if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then +if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT. echo Aborting installation. Unset one or reset the other, then try again echo INSTALL_ROOT="$INSTALL_ROOT" @@ -47,10 +48,10 @@ exit 1 fi -SBCL_HOME="$INSTALL_ROOT"/lib/sbcl +SBCL_HOME="$LIB_DIR"/sbcl export SBCL_HOME INSTALL_ROOT ensure_dirs "$BUILD_ROOT$INSTALL_ROOT" "$BUILD_ROOT$INSTALL_ROOT"/bin \ - "$BUILD_ROOT$INSTALL_ROOT"/lib \ + "$BUILD_ROOT$LIB_DIR" \ "$BUILD_ROOT$MAN_DIR" "$BUILD_ROOT$MAN_DIR"/man1 \ "$BUILD_ROOT$INFO_DIR" "$BUILD_ROOT$DOC_DIR" \ "$BUILD_ROOT$DOC_DIR"/html \ @@ -90,7 +91,7 @@ echo echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" +echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl/" # Installing manual & misc bits of documentation #