(usage): Use the PACKAGE_BUGREPORT e-mail address, rather than hard-coding it.

diff --git a/src/basename.c b/src/basename.c
index 8cd7400..139b9e9 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -63,7 +63,7 @@ If specified, also remove a trailing SUFFIX.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/chroot.c b/src/chroot.c
index edc2da5..7600875 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -56,7 +56,7 @@ Run COMMAND with root directory set to NEWROOT.\n\
 \n\
 If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/date.c b/src/date.c
index 1c2c5e7..ca541b1 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -214,7 +214,7 @@ the following modifiers between `%' and a numeric directive.\n\
   `-' (hyphen) do not pad the field\n\
   `_' (underscore) pad the field with spaces\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/dirname.c b/src/dirname.c
index ff6e617..6dfb0b3 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -55,7 +55,7 @@ output `.' (meaning the current directory).\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/echo.c b/src/echo.c
index 8dbe53b..929f101 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -102,7 +102,7 @@ Without -E, the following sequences are recognized and interpolated:\n\
   \\t     horizontal tab\n\
   \\v     vertical tab\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/env.c b/src/env.c
index e96c97c..59bd038 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -131,7 +131,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\
 \n\
 A mere - implies -i.  If no COMMAND, print the resulting environment.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/expr.c b/src/expr.c
index fc61dd8..1800070 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -145,7 +145,7 @@ Comparisons are arithmetic if both ARGs are numbers, else lexicographical.\n\
 Pattern matches return the string matched between \\( and \\) or null; if\n\
 \\( and \\) are not used, they return the number of characters matched or 0.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/factor.c b/src/factor.c
index 52f0ee9..491f406 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -87,7 +87,7 @@ Print the prime factors of each NUMBER.\n\
   Print the prime factors of all specified integer NUMBERs.  If no arguments\n\
   are specified on the command line, they are read from standard input.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/hostid.c b/src/hostid.c
index 744d7ed..21bbde7 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -54,7 +54,7 @@ Print the numeric identifier (in hexadecimal) for the current host.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/hostname.c b/src/hostname.c
index 2171ff0..fe4aeb6 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -73,7 +73,7 @@ Print or set the hostname of the current system.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/id.c b/src/id.c
index 972d102..a4a2207 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -101,7 +101,7 @@ Print information for USERNAME, or the current user.\n\
 \n\
 Without any OPTION, print some useful set of identified information.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/kill.c b/src/kill.c
index 38da475..5f22a4f 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -116,7 +116,7 @@ SIGNAL may be a signal name like `HUP', or a signal number like `1',\n\
 or an exit status of a process terminated by a signal.\n\
 PID is an integer; if negative it identifies a process group.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/logname.c b/src/logname.c
index 0d3fcf2..b3fe3eb 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -52,7 +52,7 @@ Print the name of the current user.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/nice.c b/src/nice.c
index 9d2099a..c7ff18d 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -74,7 +74,7 @@ by default.  Range goes from -20 (highest priority) to 19 (lowest).\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/pathchk.c b/src/pathchk.c
index 3722b43..fa81b1b 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -145,7 +145,7 @@ Diagnose unportable constructs in NAME.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/pinky.c b/src/pinky.c
index 8df3cfb..6377d48 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -489,7 +489,7 @@ usage (int status)
 A lightweight `finger' program;  print user information.\n\
 The utmp file will be %s.\n\
 "), UTMP_FILE);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/printenv.c b/src/printenv.c
index a8526c6..68608e1 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -69,7 +69,7 @@ If no environment VARIABLE specified, print them all.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/printf.c b/src/printf.c
index d4fa81d..8496446 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -138,7 +138,7 @@ FORMAT controls the output as in C printf.  Interpreted sequences are:\n\
 and all C format specifications ending with one of diouxXfeEgGcs, with\n\
 ARGUMENTs converted to proper type first.  Variable widths are handled.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/pwd.c b/src/pwd.c
index ff0a8e0..7b94113 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -51,7 +51,7 @@ Print the full filename of the current working directory.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/seq.c b/src/seq.c
index d152809..6acb611 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -101,7 +101,7 @@ INCREMENT should be positive if FIRST is smaller than LAST, and negative\n\
 otherwise.  When given, the FORMAT argument must contain exactly one of\n\
 the printf-style, floating point output formats %e, %f, %g\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/sleep.c b/src/sleep.c
index f76ee40..57be102 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -80,7 +80,7 @@ point number.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/stty.c b/src/stty.c
index 632c3c4..3fe28c0 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -708,7 +708,7 @@ prints baud rate, line discipline, and deviations from stty sane.  In\n\
 settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n\
 127; special values ^- or undef used to disable special characters.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/su.c b/src/su.c
index 563489c..65bb8b3 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -447,7 +447,7 @@ Change the effective user id and group id to that of USER.\n\
 \n\
 A mere - implies -l.   If USER not given, assume root.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
       close_stdout ();
     }
   exit (status);

diff --git a/src/tee.c b/src/tee.c
index d369678..c71797a 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -69,7 +69,7 @@ Copy standard input to each FILE, and also to standard output.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/test.c b/src/test.c
index 04ca2a2..f7b16f2 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1064,7 +1064,7 @@ EXPRESSION is true or false and sets exit status.  It is one of:\n\
 Beware that parentheses need to be escaped (e.g., by backslashes) for shells.\n\
 INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/true.c b/src/true.c
index c4a42db..004b77e 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -25,7 +25,7 @@ These option names may not be abbreviated.\n\
          program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-  puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+  printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
   exit (status);
 }
 

diff --git a/src/tty.c b/src/tty.c
index bc988eb..d61961c 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -67,7 +67,7 @@ Print the file name of the terminal connected to standard input.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/uname.c b/src/uname.c
index 8344669..7b91f8a 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -110,7 +110,7 @@ Print certain system information.  With no OPTION, same as -s.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/uptime.c b/src/uptime.c
index a684fa3..ce39fea 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -182,7 +182,7 @@ If FILE is not specified, use %s.  %s as FILE is common.\n\
              UTMP_FILE, WTMP_FILE);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/users.c b/src/users.c
index 5a1bf1f..6067724 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -124,7 +124,7 @@ If FILE is not specified, use %s.  %s as FILE is common.\n\
              UTMP_FILE, WTMP_FILE);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/who.c b/src/who.c
index 45efe79..156c7bc 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -619,7 +619,7 @@ usage (int status)
 If FILE is not specified, use %s.  %s as FILE is common.\n\
 If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n\
 "), UTMP_FILE, WTMP_FILE);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/whoami.c b/src/whoami.c
index ec20bb6..d3d03d9 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -57,7 +57,7 @@ Same as id -un.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/yes.c b/src/yes.c
index 91fd0bd..d743501 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -58,7 +58,7 @@ Repeatedly output a line with all specified STRING(s), or `y'.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }