From bda75ca0d34dee45c3adfea9dc3b2c368f055d75 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 15 Jun 2001 01:10:24 +0000
Subject: [PATCH] 	* 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.

---
 ChangeLog         |  7 +++++++
 THANKS            |  1 +
 automake.in       |  2 +-
 tests/Makefile.am |  1 +
 tests/Makefile.in |  1 +
 tests/yacc6.test  | 37 +++++++++++++++++++++++++++++++++++++
 6 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 tests/yacc6.test

diff --git a/ChangeLog b/ChangeLog
index 812d4490..5cf3bbfe 100644
--- 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 8cb7ba4d..86b8fb71 100644
--- 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 d7d7feb7..32f06b73 100755
--- 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 88843b30..2fe2cfbe 100644
--- 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 3f087902..986520d4 100644
--- 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
index 00000000..3f2434c7
--- /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
-- 
2.43.5