. ./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
-SBCL_HOME=`pwd`/contrib
+. ./sbcl-pwd.sh
+sbcl_pwd
+
+SBCL_HOME=$SBCL_PWD/contrib
export SBCL_HOME
-SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
+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