diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 22:13:45 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 22:13:45 +0000 |
| commit | 8b748aed2a9ab4b964faa5722f7a182a060e475c (patch) | |
| tree | 61bc3fd494c9230f44c3c84a4ac51a32711223ed /iconv | |
| parent | 92e4b6a92716f8b2457376291171a6330d072b0d (diff) | |
| download | glibc-8b748aed2a9ab4b964faa5722f7a182a060e475c.tar.gz | |
Support --with-pkgversion and --with-bugurl.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/iconv_prog.c | 9 | ||||
| -rw-r--r-- | iconv/iconvconfig.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 36168a1a91..62c6794e4f 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -400,13 +400,16 @@ parse_opt (int key, char *arg, struct argp_state *state) static char * more_help (int key, const char *text, void *input) { + char *tp = NULL; switch (key) { case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ - return strdup (gettext ("\ + if (asprintf (&tp, gettext ("\ For bug reporting instructions, please see:\n\ -<http://www.gnu.org/software/libc/bugs.html>.\n")); +%s.\n"), REPORT_BUGS_TO) < 0) + return NULL; + return tp; default: break; } @@ -418,7 +421,7 @@ For bug reporting instructions, please see:\n\ static void print_version (FILE *stream, struct argp_state *state) { - fprintf (stream, "iconv (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, "iconv %s%s\n", PKGVERSION, VERSION); fprintf (stream, gettext ("\ Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 0379ec37a0..d70b0136bd 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -375,13 +375,16 @@ parse_opt (int key, char *arg, struct argp_state *state) static char * more_help (int key, const char *text, void *input) { + char *tp = NULL; switch (key) { case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ - return strdup (gettext ("\ + if (asprintf (&tp, gettext ("\ For bug reporting instructions, please see:\n\ -<http://www.gnu.org/software/libc/bugs.html>.\n")); +%s.\n"), REPORT_BUGS_TO) < 0) + return NULL; + return tp; default: break; } @@ -393,7 +396,7 @@ For bug reporting instructions, please see:\n\ static void print_version (FILE *stream, struct argp_state *state) { - fprintf (stream, "iconvconfig (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, "iconvconfig %s%s\n", PKGVERSION, VERSION); fprintf (stream, gettext ("\ Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ |