Back in January, we had a discussion about formatting of --help output. The
result was that coreutils changed to a new style. It has now been several
months and several releases, with no complaints about the new style. Also,
autoconf 2.64 has been released in the meantime, with support for a more
reliable package URL (if your PACKAGE_NAME starts with "GNU ", then autoconf
2.64 gives you the same URL as this code gives when using autoconf 2.63,
without you having to do anything in your configure.ac). So how about letting
all other gnulib clients of version-etc pick up this change?
A couple of points to think about. Right now, standards.texi recommends:
Report bugs to: m...@example.com
while coreutils uses:
Report PROGNAME bugs to m...@example.com
Depending on what others think, we could easily add a ':' to coreutils, as well
as modify this patch to reuse last_component(program_name) (which is derived
from argv[0]). Also, coreutils renamed its function from
emit_bug_reporting_address to emit_ancillary_info.
From: Eric Blake <e...@byu.net>
Date: Mon, 9 Nov 2009 15:18:13 -0700
Subject: [PATCH] version-etc: match coreutils style
Coreutils switched to this style on 2009-02-01, with no complaints.
This assumes that PACKAGE_BUGREPORTS and PACKAGE_PACKAGER_BUG_REPORTS
are generally email addresses, not URLs.
* lib/version-etc.c (emit_bug_reporting_address): Drop periods,
and use <> only for URLs.
Signed-off-by: Eric Blake <e...@byu.net>
---
ChangeLog | 6 ++++++
lib/version-etc.c | 12 ++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a006720..f7b28b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-11-09 Eric Blake <e...@byu.net>
+ version-etc: match coreutils style
+ * lib/version-etc.c (emit_bug_reporting_address): Drop periods,
+ and use <> only for URLs.
+
+2009-11-09 Eric Blake <e...@byu.net>
+
link: detect FreeBSD bug
* m4/link.m4 (gl_FUNC_LINK): Also detect FreeBSD bug with slash on
symlink.
diff --git a/lib/version-etc.c b/lib/version-etc.c
index a580140..a6df95d 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -236,13 +236,17 @@ emit_bug_reporting_address (void)
for this package. Please add _another line_ saying
"Report translation bugs to <...>\n" with the address for translation
bugs (typically your translation team's web or email address). */
- printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+ printf (_("\nReport bugs to %s\n"), PACKAGE_BUGREPORT);
#ifdef PACKAGE_PACKAGER_BUG_REPORTS
- printf (_("Report %s bugs to <%s>.\n"), PACKAGE_PACKAGER,
+ printf (_("Report %s bugs to <%s>\n"), PACKAGE_PACKAGER,
PACKAGE_PACKAGER_BUG_REPORTS);
#endif
- printf (_("%s home page: <http://www.gnu.org/software/%s/>.\n"),
+#ifdef PACKAGE_URL
+ printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
+#else
+ printf (_("%s home page: <http://www.gnu.org/software/%s/>\n"),
PACKAGE_NAME, PACKAGE);
- fputs (_("General help using GNU software:
<http://www.gnu.org/gethelp/>.\n"),
+#endif
+ fputs (_("General help using GNU software: <http://www.gnu.org/gethelp/>\n"),
stdout);
}
--
1.6.4.2
