Move bug report string to one place.

11 files changed, 34 insertions, 13 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f89a4e8..27720da 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,21 @@
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* bucomm.h: #include "bin-bugs.h"
+	* addr2line.c (usage): Use REPORT_BUGS_TO.
+	* ar.c (usage): Likewise.
+	* nlmconv.c (show_usage): Likewise.
+	* nm.c (usage): Likewise.
+	(OPTION_TARGET): Define.
+	(long_options): Use OPTION_TARGET rather than 200.
+	(main): Likewise.
+
+	* objcopy.c (copy_usage): Likewise.
+	(strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+
 2000-03-31  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* readelf.c: Include sys/types.h before sys/stat.h for ultrix.
@@ -7,7 +25,7 @@
 	* rddbg.c (read_section_stabs_debugging_info): Catch out of range
 	string offsets in corrupt stabs entries.
 
-2000-03-27  Alan Modra  <alan@linuxcare.com>
+2000-03-27  Alan Modra  <alan@linuxcare.com.au>
 
 	* readelf.c: Include elf/avr.h
 	(dump_relocations): Add EM_AVR case.
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 72707c2..d72207b 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -80,7 +80,7 @@ Usage: %s [-CfsHV] [-b bfdname] [--target=bfdname]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/ar.c b/binutils/ar.c
index ad9e59d..728185e 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -283,7 +283,7 @@ usage (help)
   list_supported_targets (program_name, stderr);
 
   if (help)
-    fprintf (s, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (s, REPORT_BUGS_TO);
 
   xexit (help ? 0 : 1);
 }
diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index 36e6a79..f211473 100644
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/types.h>
 
 #include "config.h"
+#include "bin-bugs.h"
 
 #ifdef USE_BINARY_FOPEN
 #include "fopen-bin.h"
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c
index f1c8b6c..93788a9 100644
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -1138,7 +1138,7 @@ Usage: %s [-dhV] [-I bfdname] [-O bfdname] [-T header-file] [-l linker]\n\
        [in-file [out-file]]\n"),
 	   program_name);
   if (status == 0)
-    fprintf (file, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (file, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/nm.c b/binutils/nm.c
index ade3f7c..e947697 100644
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -255,6 +255,8 @@ static char *target = NULL;
 static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 
+#define OPTION_TARGET 200
+
 static struct option long_options[] =
 {
   {"debug-syms", no_argument, &print_debug_syms, 1},
@@ -275,7 +277,7 @@ static struct option long_options[] =
   {"reverse-sort", no_argument, &reverse_sort, 1},
   {"size-sort", no_argument, &sort_by_size, 1},
   {"stats", no_argument, &show_stats, 1},
-  {"target", required_argument, 0, 200},
+  {"target", required_argument, 0, OPTION_TARGET},
   {"defined-only", no_argument, &defined_only, 1},
   {"undefined-only", no_argument, &undefined_only, 1},
   {"version", no_argument, &show_version, 1},
@@ -301,7 +303,7 @@ Usage: %s [-aABCDglnopPrsuvV] [-t radix] [--radix=radix] [--target=bfdname]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
@@ -448,7 +450,7 @@ main (argc, argv)
 	  show_version = 1;
 	  break;
 
-	case 200:		/* --target */
+	case OPTION_TARGET:	/* --target */
 	  target = optarg;
 	  break;
 
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 37b12e7..f6048b7 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -341,7 +341,7 @@ copy_usage (stream, exit_status)
 "));
   list_supported_targets (program_name, stream);
   if (exit_status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (exit_status);
 }
 
@@ -373,7 +373,7 @@ strip_usage (stream, exit_status)
 
   list_supported_targets (program_name, stream);
   if (exit_status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (exit_status);
 }
 
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 488d4f3..81c79f4 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -274,7 +274,7 @@ usage (stream, status)
       disassembler_usage (stream);
     }
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index cd1e127..6081066 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1700,7 +1700,7 @@ usage ()
   fprintf (stdout, _("  -I or --histogram         Display histogram of bucket list lengths\n"));
   fprintf (stdout, _("  -v or --version           Display the version number of readelf\n"));
   fprintf (stdout, _("  -H or --help              Display this information\n"));
-  fprintf (stdout, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+  fprintf (stdout, REPORT_BUGS_TO);
 
   exit (0);
 }
diff --git a/binutils/strings.c b/binutils/strings.c
index fb139fa..65ea92f 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -509,6 +509,6 @@ Usage: %s [-afov] [-n min-len] [-min-len] [-t {o,x,d}] [-]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
diff --git a/binutils/windres.c b/binutils/windres.c
index 3b24b47..a2f6fe7 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -734,7 +734,7 @@ extension if not specified.  A single file name is an input file.\n\
 No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"));
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }