Merge branch 'maint'

[platform/upstream/automake.git] / t / acloca22.sh

diff --git a/t/acloca22.sh b/t/acloca22.sh
index 85ef29b..ea76579 100755 (executable)
--- a/t/acloca22.sh
+++ b/t/acloca22.sh
@@ -15,39 +15,43 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure the "deleted header file" issue is fixed w.r.t. aclocal.m4
-# dependencies.  See also related the tests 'remake-deleted-m4-file.test'
-# and 'remake-renamed-m4-macro-and-file.test'.
+# dependencies.  See also related the tests 'remake-deleted-m4-file.sh'
+# and 'remake-renamed-m4-macro-and-file.sh'.
 
-. ./defs || Exit 1
+. ./defs || exit 1
 
 cat >>configure.ac <<EOF
+AC_CONFIG_MACRO_DIR([.])
 FOO
 AC_OUTPUT
 EOF
+
 cat >foo.m4 <<EOF
 AC_DEFUN([FOO], [AC_SUBST([GREPFOO])])
 EOF
+
 cat >bar.m4 <<EOF
 AC_DEFUN([BAR], [AC_SUBST([GREPBAR])])
 EOF
-cat >Makefile.am <<EOF
-ACLOCAL_AMFLAGS = -I .
-EOF
 
-$ACLOCAL -I .
+: >Makefile.am
+
+$ACLOCAL
 $AUTOMAKE
 $AUTOCONF
 
 ./configure
+
 $MAKE
 grep GREPFOO Makefile
-grep GREPBAR Makefile && Exit 1
+grep GREPBAR Makefile && exit 1
 
 sed 's/FOO/BAR/' < configure.ac > t
 mv -f t configure.ac
 rm -f foo.m4
+
 $MAKE
-grep GREPFOO Makefile && Exit 1
+grep GREPFOO Makefile && exit 1
 grep GREPBAR Makefile
 
 :