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.

diff --git a/man/local.mk b/man/local.mk
index ae74bf6ce10bed49cd31506aecc441cfdf8a8dba..9759eabce490fc4426ac5cd9c520f87675f9f2b2 100644 (file)
--- a/man/local.mk
+++ b/man/local.mk
@@ -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
 

diff --git a/src/system.h b/src/system.h
index 4a47e15cac2acab450b0f258b02de06af951060e..ca223d547ed67d28eaa90575a00a875ce3721dcf 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -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.  */