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

diff --git a/src/basename.c b/src/basename.c
index 8cd7400d9a31d47053d0779da1f8291aeb5d93cc..139b9e90c39d02550fcbc9edded5522b2b8835b4 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 edc2da58eb152791050dd11cd4b124542688bd38..7600875879fb6f239f5486cf0983f27768f7da13 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 1c2c5e7428bcbd8e9b8219d20a7f88a4755683c1..ca541b193387d419bc00075ce643ac1d28e30e61 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 ff6e617e34bafe20379ce30d11c127f3940b730b..6dfb0b34040888d0b697098ee711899e994d9ca8 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 8dbe53b757694dbbead013a58f62ee6e9cd1e460..929f10106e4977d317961c8024873f2a81d07b54 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 e96c97c47609cbe42bf84d026d0d674003c4bbbb..59bd03839d216dc2eb2a00673aa4332f19a7c8c9 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 fc61dd821a021b2edaf87fda32655c3fa79cdcac..18000705d2ee38afaafa64c247482b017247ec75 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 52f0ee93983cf7ce55b067e4ce955ae2014ae279..491f406f26a5009c0913afe44315ec3b288055ee 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 744d7edb5feea9cd74de84f8887a99052b49edb5..21bbde7c6281b899091d626c4a64957869fedbf0 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 2171ff053208def4b33f3ae714922af4f9d6aff8..fe4aeb682ad23d8142a2efc0c11178106bc310ca 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 972d10206a4797bdca5679f629b95ce13ef30404..a4a2207d78998372afeb517d9a80eef34b4bc77e 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 38da475ae86aa05c9f46fff2736049e3b09e763d..5f22a4fa896daccdf09d97ed558858c2c5c548fc 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 0d3fcf2d30442c1633e4d8579a1baa32bb8855ca..b3fe3eb170412af688b6f02e7e3a737c0881abee 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 9d2099acfccc514a15b845b3184116c29df98ba8..c7ff18d41388a0709e60831e8bc2348f325e2924 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 3722b438c419d39f11420fba5bf0139b9c7c9f87..fa81b1b6875d258f2dfaf5ec14fbaf0ddc37603b 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 8df3cfb13f65beae7f3a33d5f569d43b8f1d078e..6377d483bd0605bb003c982ad8bfb1a627cc0aa4 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 a8526c66998e5d94fcba63740f988076ecda484a..68608e113428b2ebc9ec7592497efc1a560f8db9 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 d4fa81df68d228ca9f566dc9c8e714c15493eb0c..8496446dce10a234e095d3317d4d8450d17ed109 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 ff0a8e06b34afa9e5fe49c99aea104cea1030ec7..7b941132c34c04688a52e1421fabebd17a4ba53c 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 d152809bb4d797e415cb6aaa7a6c153ee939f61f..6acb6115d78bfbddb7c48257f68297111254a808 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 f76ee40770fa194cf13e7bd9c9f57e372e0bd0b3..57be102de9d54d4a920f5e0d20bc4e7e2555b955 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 632c3c468b5443969ff2eb7fa6bf2d2f3bc1b4a4..3fe28c0e2faf750c89726727e63ee987d606f0e2 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 563489c539e22ee33c570d305291fa4f6e3105a9..65bb8b3fc518c78b744361a27574ef48d4caf724 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 d369678852c0cf574460b5760afbef5523274570..c71797a47f376df7522c566f53c01f0f2a8a6caf 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 04ca2a21be40def167381369b55b74777ef6d583..f7b16f27c8dd96f455513b17c8bd8e7920577e96 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 c4a42dbcf99df52fd34ce6f1197eae2c420c4dfc..004b77ef6389533bebefc19abe71aed81a9e5471 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 bc988ebca6479c1008d2763f69ad7710e6d4ad97..d61961c019b8bfba4304334f6e98fd7f2406269d 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 83446692145385f8404aa275935fb272d1b822d1..7b91f8af105c46ff2c0fbc5c0f14a117d5ccff0a 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 a684fa3dd06bda78f82e2b66e93fe2b43b2ba1f9..ce39fead055f9d09246fcd69b751cab461f2b9c6 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 5a1bf1f721fe0e240fed2946241d21b86634469c..6067724c6ef55065a00c5e001dc17126824d78cf 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 45efe795f6e30ef29e27a73db5e91938f7922527..156c7bc1607b71d6a7269d23411c29d6888dc8f3 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 ec20bb67ac9be3c4106a496cc1f6c41ffb1218a4..d3d03d9057147eecb5666e32f1425afc47883b93 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 91fd0bd2dcae447c6edb3aaa75efebb05cb40eeb..d743501fc28a48abf408a322629d7ca711c657b9 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);
 }