X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=78d6574fa7dfbd55323ce1f96f12856d0c10a60f;hb=22a6702974b7d6ff4e8f2b3b7b5ff446fc632de0;hp=c4d1e4868863e7e0d1148062f216a5d69839ddf7;hpb=e9a993b24fefb6ca1f4a8c40a5063053a01090af;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index c4d1e48..78d6574 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -21,14 +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
-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
 
@@ -38,7 +37,16 @@ export SBCL SBCL_BUILDING_CONTRIB
 # as SB-RT and SB-GROVEL, but FIXME: there's probably a better
 # solution.  -- CSR, 2003-05-30
 
-find contrib/ \( -name '*.fasl' -o -name 'foo.c' -o -name 'a.out' -o -name 'alien.so' -o -name '*.o' \) \
+find contrib/ \( -name '*.fasl' -o \
+                 -name '*.FASL' -o \
+                 -name 'foo.c' -o \
+                 -name 'FOO.C' -o \
+                 -name 'a.out' -o \
+                 -name 'A.OUT' -o \
+                 -name 'alien.so' -o \
+                 -name 'ALIEN.SO' -o \
+                 -name '*.o' -o \
+                 -name '*.O' \) \
   -print | xargs rm -f
 
 for i in contrib/*; do