build: resolve conflict with new declaration from version-etc.h

* src/system.h (emit_bug_reporting_address): Define away,
now, gnulib's version-etc.h also declares this function.
In this package, we choose to include each program's name in
the diagnostic.  Define away the conflicting declaration.
(emit_bug_reporting_address): Also emit home page and
"General help..." links, like the new function does.
Reported by Bob Proulx.
This commit is contained in:
Jim Meyering committed 2009-01-23 18:27:36 +01:00
1 parent 10f3e12a0d
commit 016f8c9998
1 file changed
+8
+8
View File
@@ -441,7 +441,11 @@ 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 (leaving proper_name_utf8, which affects far
fewer programs), since it's not worth the cost of adding ~17KB to
@@ -617,6 +621,10 @@ emit_bug_reporting_address (void)
{
printf (_("\nReport %s bugs to <%s>.\n"), last_component (program_name),
PACKAGE_BUGREPORT);
printf (_("%s home page: http://www.gnu.org/software/%s/\n"),
PACKAGE_NAME, PACKAGE);
printf (_("General help using GNU software: http://www.gnu.org/gethelp/\n"));
/* TRANSLATORS: Replace LANG_CODE in this URL with your language code
<http://translationproject.org/team/LANG_CODE.html> to form one of
the URLs at http://translationproject.org/team/. Otherwise, replace