0.9.13.16: preliminary Windows installer builder

[sbcl.git] / make-target-contrib.sh

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 6d10ca3..78d6574 100644 (file)
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -21,20 +21,13 @@ export LANG LC_ALL
 . ./find-gnumake.sh
 find_gnumake
 
-# usually SBCL_HOME refers to the installed root of SBCL, not the
-# build directory.  Right now, however, where there are dependencies
-# between contrib packages, we want the _uninstalled_ versions to be
-# found
-if [ "$OSTYPE" = "cygwin" ] ; then
-    SBCL_BASE=`cygpath -m $(pwd)`
-else
-    SBCL_BASE=`pwd`
-fi
-SBCL_HOME=$SBCL_BASE/contrib
-export SBCL_HOME
+. ./sbcl-pwd.sh
+sbcl_pwd
 
+SBCL_HOME=$SBCL_PWD/contrib
+export SBCL_HOME
 
-SBCL="$SBCL_BASE/src/runtime/sbcl --noinform --core $SBCL_BASE/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
+SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB