From 7c75aeb218a6d57e835263c28de3f2d4ed929d85 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 21 May 2004 17:43:56 +0000 Subject: [PATCH] * tests/txinfo22.test (AC_CONFIG_AUX_DIR): Use aux1, not aux, for cygwin compatibility. * tests/yacc6.test (AC_CONFIG_AUX_DIR): Likewise. --- ChangeLog | 6 +++++- tests/txinfo22.test | 6 +++--- tests/yacc6.test | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ab53b5dd..2b876c0a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2004-05-21 Eric Blake (tiny change) +2004-05-21 Eric Blake (tiny changes) + + * tests/txinfo22.test (AC_CONFIG_AUX_DIR): Use aux1, not aux, for + cygwin compatibility. + * tests/yacc6.test (AC_CONFIG_AUX_DIR): Likewise. * tests/conflnk3.test: Isolate checking for working `test -e' into a subshell, to skip this test on broken /bin/sh of solaris. diff --git a/tests/txinfo22.test b/tests/txinfo22.test index 8607431e7..51c1de075 100755 --- a/tests/txinfo22.test +++ b/tests/txinfo22.test @@ -30,7 +30,7 @@ set -e cat > configure.in << 'END' AC_INIT([txinfo22], [1.0]) -AC_CONFIG_AUX_DIR(aux) +AC_CONFIG_AUX_DIR([aux1]) AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -55,7 +55,7 @@ Hello walls. @bye END -mkdir aux +mkdir aux1 mkdir tex cp $testsrcdir/../lib/texinfo.tex tex @@ -64,7 +64,7 @@ $AUTOMAKE --add-missing $AUTOCONF test ! -f texinfo.tex -test ! -f aux/texinfo.tex +test ! -f aux1/texinfo.tex test -f tex/texinfo.tex ./configure diff --git a/tests/yacc6.test b/tests/yacc6.test index 2f067873d..41bcb0c29 100755 --- a/tests/yacc6.test +++ b/tests/yacc6.test @@ -30,7 +30,7 @@ set -e cat > configure.in << 'END' AC_INIT([yacc6], [1.0]) -AC_CONFIG_AUX_DIR([aux]) +AC_CONFIG_AUX_DIR([aux1]) AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile]) AC_PROG_CC @@ -48,7 +48,7 @@ test-time-changed: test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = sub/main.$(OBJEXT) END -mkdir aux sub +mkdir aux1 sub cat > sub/Makefile.am << 'END' bin_PROGRAMS = foo bar @@ -87,10 +87,10 @@ EOF $ACLOCAL $AUTOCONF $AUTOMAKE -a -test -f aux/ylwrap +test -f aux1/ylwrap test ! -f ylwrap test ! -f sub/ylwrap -$FGREP '(top_srcdir)/aux/ylwrap' sub/Makefile.in +$FGREP '(top_srcdir)/aux1/ylwrap' sub/Makefile.in ./configure $MAKE grep '#.*line.*foo.y' sub/foo.c -- 2.47.2