* tests/txinfo22.test (AC_CONFIG_AUX_DIR): Use aux1, not aux, for

cygwin compatibility.
* tests/yacc6.test (AC_CONFIG_AUX_DIR): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5ab53b5dd6d89430e79da82dae16c4797a48bbab..2b876c0a8b5e5ddc237d3b50520daa74d78958df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2004-05-21  Eric Blake  <ebb9@byu.net>  (tiny change)
+2004-05-21  Eric Blake  <ebb9@byu.net>  (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 8607431e7ecf16717cac1df44838e5fffc8fc2b1..51c1de0756be4c314ebf92807ed48da28e6dd71b 100755 (executable)
--- 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 2f067873df514c81289c698c294faa7775ef7e1d..41bcb0c296f1d2aa8d6ec4a8b5b060d4c6d87110 100755 (executable)
--- 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