maint: --help now outputs bug reporting address

This changes the tail of "cat --help" output from:

GNU coreutils online help: <https://www.gnu.org/software/coreutils/>
Full documentation <https://www.gnu.org/software/coreutils/cat>
or available locally via: info '(coreutils) cat invocation'

to:

Report bugs to: bug-coreutils@gnu.org
GNU coreutils home page: <https://www.gnu.org/software/coreutils/>
General help using GNU software: <https://www.gnu.org/gethelp/>
Full documentation <https://www.gnu.org/software/coreutils/cat>
or available locally via: info '(coreutils) cat invocation'

* src/system.h (emit_bug_reporting_address): Don’t #define.
(emit_ancillary_info): Call emit_bug_reporting_address
instead of doing it by hand, which omitted the bug reporting address.
This commit is contained in:
Paul Eggert 2025-05-14 13:36:40 -07:00
parent bd8be6b99e
commit c8cbb321d9
2 changed files with 2 additions and 11 deletions

View File

@ -54,7 +54,7 @@ mandeps =
# Depend on this to get version number changes.
mandeps += .version
# This is required so that changes to e.g., emit_bug_reporting_address
# This is required so that changes to e.g., emit_ancillary_info
# provoke regeneration of all the manpages.
mandeps += $(top_srcdir)/src/system.h

View File

@ -333,9 +333,7 @@ enum
#include "closein.h"
#include "closeout.h"
#define emit_bug_reporting_address unused__emit_bug_reporting_address
#include "version-etc.h"
#undef emit_bug_reporting_address
#include "propername.h"
/* Define away proper_name, since it's not worth the cost of adding ~17KB to
@ -651,14 +649,7 @@ emit_ancillary_info (char const *program)
if (map_prog->node)
node = map_prog->node;
printf (_("\n%s online help: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
#ifdef PACKAGE_PACKAGER
# ifdef PACKAGE_PACKAGER_BUG_REPORTS
printf (_("Report %s bugs to: <%s>\n"), PACKAGE_PACKAGER,
PACKAGE_PACKAGER_BUG_REPORTS);
# endif
#endif
emit_bug_reporting_address ();
/* Don't output this redundant message for English locales.
Note we still output for 'C' so that it gets included in the man page. */