[augeas-devel] [PATCH] Make distcheck work again

[David Lutterkort]

2 files changed, 4 insertions(+), 3 deletions(-)
tests/Makefile.am |    4 +++-
tests/test-get.sh |    3 +--


# HG changeset patch
# User David Lutterkort <dlutter at redhat.com>
# Date 1212083479 25200
# Node ID 01489ef21f1d35aaacb729d5c082be1cd7d7663d
# Parent  e073c9665e6cd19080a61092598a602e3dc3636c
Make distcheck work again

Restore top_builddir and top_srcdir so that augtest passes during make
distcheck.

diff -r e073c9665e6c -r 01489ef21f1d tests/Makefile.am
--- a/tests/Makefile.am	Thu May 29 10:36:11 2008 -0700
+++ b/tests/Makefile.am	Thu May 29 10:51:19 2008 -0700
@@ -15,7 +15,9 @@ check_PROGRAMS = fatest
 check_PROGRAMS = fatest
 
 TESTS_ENVIRONMENT = \
-  PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH"
+  PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
+  top_builddir=$(abs_top_builddir) \
+  top_srcdir=$(abs_top_srcdir)
 
 TESTS = $(check_SCRIPTS) $(check_PROGRAMS) augtest
 
diff -r e073c9665e6c -r 01489ef21f1d tests/test-get.sh
--- a/tests/test-get.sh	Thu May 29 10:36:11 2008 -0700
+++ b/tests/test-get.sh	Thu May 29 10:51:19 2008 -0700
@@ -7,9 +7,8 @@ TOPDIR=$(cd $(dirname $0)/.. && pwd)
 [[ -n "$top_builddir" ]] || top_builddir=$TOPDIR
 [[ -n "$top_srcdir" ]] || top_srcdir=$TOPDIR
 
-AUGTOOL=${top_builddir}/src/augtool
 export AUGEAS_LENS_LIB=${top_srcdir}/lenses
 export AUGEAS_ROOT=${top_srcdir}/tests/root
 
-$AUGTOOL print '/augeas/files' | grep -q /error && ret=1 || ret=0
+augtool print '/augeas/files' | grep -q /error && ret=1 || ret=0
 exit $ret