From bc3b0b5577bd08e131e2c0884b30d364e6d3b38a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 11 May 2007 07:25:07 +0000
Subject: *** no comment ***

---
 run_verify.sh | 10 +++++++---
 verify.sh     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/run_verify.sh b/run_verify.sh
index 719cb632..0a9d2f31 100755
--- a/run_verify.sh
+++ b/run_verify.sh
@@ -7,9 +7,11 @@
 #
 #   0 0 * * * $HOME/src/ledger/run_verify.sh /tmp
 #
-# Note that this script should be run as root!  Also, whether on
-# success or failure the build log and build products are left in the
-# temporary directory for later examination if desired.
+# Note that this script should be run as root, otherwise it will be
+# unable to clean up after itself (since make distcheck creates files
+# owned by a different user).  Also, whether on success or failure the
+# build log and build products are left in the temporary directory for
+# later examination if desired.
 
 SRCDIR=$(dirname $0)
 
@@ -26,3 +28,5 @@ cp -p "$SRCDIR"/verify.sh . || exit 1
 (./verify.sh > verify.out 2>&1 || (cat verify.out; exit 1))
 
 rm -f verify.sh
+
+exit 0
diff --git a/verify.sh b/verify.sh
index 65dbfaba..2f738e3f 100755
--- a/verify.sh
+++ b/verify.sh
@@ -75,7 +75,7 @@ function build_distcheck_from_distrib() {
     dup_working_tree distcheck_distrib || exit 1
     cd distcheck_distrib || exit 1
     ./configure CPPFLAGS="$MY_CPPFLAGS" LDFLAGS="$MY_LDFLAGS" || exit 1
-    make distcheck || exit 1
+    make CPPFLAGS="$MY_CPPFLAGS" LDFLAGS="$MY_LDFLAGS" distcheck || exit 1
 }
 
 # Finally, we have the ordinary `build_ledger' function, which builds
-- 
cgit v1.2.3