From 24e3d887e4b1036f07bc60ae45327d89eeaa678b Mon Sep 17 00:00:00 2001
From: Christophe Rhodes <csr21@cantab.net>
Date: Thu, 31 Oct 2013 14:44:00 +0000
Subject: [PATCH] Fix install/binary-distribution scripts for new contrib
 arrangements

Everything has moved, which led the binary-distribution script not to
include test-passed files, and the install script to look for them in
the wrong place anyway.
---
 binary-distribution.sh |    6 ++++--
 install.sh             |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/binary-distribution.sh b/binary-distribution.sh
index dea1fc8..e08e28e 100755
--- a/binary-distribution.sh
+++ b/binary-distribution.sh
@@ -21,8 +21,10 @@ tar -cf $b-binary.tar \
     $b/contrib/vanilla-module.mk \
     `for contrib in $(cd $b/contrib && echo *); do
          src_dir=$b/contrib/$contrib
-         if test -d $src_dir && test -f $obj_dir/test-passed.test-report; then
-             find $src_dir -name CVS -type d -prune -o \! -type d \! -name '.cvsignore' -print
+         cache_dir=$b/obj/asdf-cache/$contrib
+         if test -d $src_dir && test -f $cache_dir/test-passed.test-report; then
+             echo $src_dir/Makefile
+             echo $cache_dir/test-passed.test-report
          fi
      done` \
     $b/obj/sbcl-home
diff --git a/install.sh b/install.sh
index 0b2efdb..5ee1c74 100644
--- a/install.sh
+++ b/install.sh
@@ -80,8 +80,8 @@ export SBCL SBCL_BUILDING_CONTRIB SBCL_PWD
 . ./find-gnumake.sh
 find_gnumake
 
-for i in `cd contrib ; echo *`; do
-    test -d contrib/$i && test -f obj/asdf-cache/$i/test-passed.test-report || continue;
+for i in `cd obj/asdf-cache ; echo *`; do
+    test -d obj/asdf-cache/$i && test -f obj/asdf-cache/$i/test-passed.test-report || continue;
     INSTALL_DIR="$SBCL_HOME/contrib/"
     export INSTALL_DIR
     ensure_dirs "$BUILD_ROOT$INSTALL_DIR" && $GNUMAKE -C contrib/$i install < /dev/null
-- 
1.7.10.4