From 34d0aedbec2df177264c023c554c2f5cbb966ccc Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Mon, 8 May 2023 12:20:08 -0600
Subject: yacc tool: further doc tweak   [skip appveyor]

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 SCons/Tool/yacc.py  |  2 +-
 SCons/Tool/yacc.xml | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SCons/Tool/yacc.py b/SCons/Tool/yacc.py
index d408e62..9751742 100644
--- a/SCons/Tool/yacc.py
+++ b/SCons/Tool/yacc.py
@@ -53,7 +53,7 @@ YaccAction = SCons.Action.Action("$YACCCOM", "$YACCCOMSTR")
 if sys.platform == 'win32':
     BINS = ['bison', 'yacc', 'win_bison']
 else:
-    BINS = ["bison", "yacc"]
+    BINS = ["bison", "yacc", "byacc"]  # for byacc, yacc is normally a link
 
 
 def _yaccEmitter(target, source, env, ysuf, hsuf) -> tuple:
diff --git a/SCons/Tool/yacc.xml b/SCons/Tool/yacc.xml
index cf466a2..cc70adb 100644
--- a/SCons/Tool/yacc.xml
+++ b/SCons/Tool/yacc.xml
@@ -48,7 +48,7 @@ See its __doc__ string for a discussion of the format.
 <tool name="yacc">
 <summary>
 <para>
-Sets construction variables for the &yacc; parse generator.
+Sets construction variables for the &yacc; parser generator.
 </para>
 </summary>
 <sets>
@@ -109,13 +109,19 @@ and adds those to the target list.
 </para>
 
 <para>
-If a <option>-d</option> option is present,
+If the <option>-d</option> option is present in &cv-YACCFLAGS;
 &scons; assumes that the call will also create a header file
 with the suffix defined by &cv-link-YACCHFILESUFFIX;
 if the yacc source file ends in a <filename>.y</filename> suffix,
 or a file with the suffix defined by &cv-link-YACCHXXFILESUFFIX;
 if the yacc source file ends in a <filename>.yy</filename> suffix.
 The header will have the same base name as the requested target.
+This is only correct if the executable is <command>bison</command>
+(or <command>win_bison</command>).
+If using Berkeley yacc (<command>byacc</command>),
+<filename>y.tab.h</filename> is always written -
+avoid the <option>-d</option> in this case and
+use &cv-link-YACC_HEADER_FILE; instead.
 </para>
 
 <para>
-- 
cgit v0.12