From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 7 Sep 2003 12:44:44 +0000 (+0000)
Subject: * tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
X-Git-Tag: Release-1-7b~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f747f1222c14cf5afb4263ea0f30f4f24ce694d6;p=thirdparty%2Fautomake.git

* tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
that we have fake version in the $PATH.
---

diff --git a/ChangeLog b/ChangeLog
index 810244c3c..671c06cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
+	that we have fake version in the $PATH.
+
 	* aclocal.in (add_file): Remove useless filling of $output, probably
 	left a after CVS conflict.  This code is now in write_aclocal.
 
diff --git a/tests/instsh.test b/tests/instsh.test
index b97989d76..29e3c0ce6 100755
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,6 +24,8 @@
 
 . ./defs || exit 1
 
+set -e
+
 : > Makefile.am
 rm -f install-sh
 
@@ -33,26 +35,11 @@ mkdir frob
 mv Makefile.am configure.in mkinstalldirs frob/
 cd frob
 
-# If srcdir is relative, we need to modify it.
-case "$srcdir" in
- [\\/]* | ?:[\\/]*)
-    ;;
-
- *)
-    srcdir="../$srcdir"
-    ;;
-esac
-
-AUTOMAKE="$PERL ../../../automake --libdir=$testsrcdir/../lib --foreign --Werror"
-ACLOCAL="$PERL ../../../aclocal -I ../../../m4 --acdir=$testsrcdir/../m4"
-
-# Now we proceed with the test
-$ACLOCAL || exit 1
-$AUTOMAKE --add-missing > output 2>&1 \
-   || exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing > output 2>&1
 
 # Only one `/' should appear in the output.
-grep '/.*/' output \
-   && exit 1
+cat output
+grep '/.*/' output && exit 1
 
 test -f install-sh