* automake.in (yacc_lex_finish_helper): Find ylwrap in

	top_srcdir.  From Tim Van Holder.
	* tests/Makefile.am (TESTS): Added yacc6.test.
	* tests/yacc6.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 812d4490d8f665327a4c73887824310b2ef2c03e..5cf3bbfed9f2b848f9a2bdcb360a1ed0db409ee4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-14  Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (yacc_lex_finish_helper): Find ylwrap in
+       top_srcdir.  From Tim Van Holder.
+       * tests/Makefile.am (TESTS): Added yacc6.test.
+       * tests/yacc6.test: New file.
+
 2001-06-14  Tim Van Holder  <tim.van.holder@pandora.be>
 
        * tests/defs, tests/installsh.test: Properly support

diff --git a/THANKS b/THANKS
index 8cb7ba4d5404462404aad3a53c6d5c614fd76dc9..86b8fb7174db79bb957707f48ad4d7b709909ce6 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -139,6 +139,7 @@ Thomas Gagne                tgagne@ix.netcom.com
 Thomas Morgan          tmorgan@pobox.com
 Thomas Tanner          tanner@ffii.org
 Tim Goodwin            tjg@star.le.ac.uk
+Tim Van Holder         tim.van.holder@pandora.be
 Ulrich Drepper         drepper@gnu.ai.mit.edu
 Vadim Zeitlin          Vadim.zeitlin@dptmaths.ens-cachan.fr
 Werner Koch            wk@isil.d.shuttle.de

diff --git a/automake.in b/automake.in
index d7d7feb76c496a04d672a22cdc5a3b10d3a33499..32f06b73fe1a75b845a2f3497eb2bba1711c697a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5027,7 +5027,7 @@ sub yacc_lex_finish_helper
     }
     else
     {
-       &define_variable ('YLWRAP', '$(srcdir)/ylwrap');
+       &define_variable ('YLWRAP', '$(top_srcdir)/ylwrap');
     }
 }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 88843b307c3ff0916c70e2cd58aab5174b24948e..2fe2cfbe53e05d025370082719fb7de710115f83 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -295,6 +295,7 @@ yacc.test \
 yacc2.test \
 yacc3.test \
 yacc4.test \
+yacc6.test \
 yaccpp.test \
 yaccvpath.test
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3f0879020a0a863ce7c0703b728c697ecd59973a..986520d4b45a53e84045a0afc0b106d95deba4ee 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -361,6 +361,7 @@ yacc.test \
 yacc2.test \
 yacc3.test \
 yacc4.test \
+yacc6.test \
 yaccpp.test \
 yaccvpath.test
 

diff --git a/tests/yacc6.test b/tests/yacc6.test
new file mode 100755 (executable)
index 0000000..3f2434c
--- /dev/null
+++ b/tests/yacc6.test
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+# Test to make sure ylwrap put in right location.
+# Report from Tim Van Holder.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT(Makefile sub/Makefile)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+
+cat > sub/Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y bar.y
+END
+
+: > sub/foo.y
+: > sub/bar.y
+
+$ACLOCAL || exit 1
+$AUTOMAKE -a || exit 1
+test -f ylwrap || exit 1
+fgrep '(srcdir)/ylwrap' sub/Makefile.in && exit 1
+exit 0