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

diff --git a/src/cat.c b/src/cat.c
index 935c1af..eb3cd5a 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -121,7 +121,7 @@ With no FILE, or when FILE is -, read standard input.\n\
   -B, --binary             use binary writes to the console device.\n\n\
 "), stdout);
 #endif
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/cksum.c b/src/cksum.c
index f98d27d..7d0fdc7 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -288,7 +288,7 @@ Print CRC checksum and byte counts of each FILE.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/comm.c b/src/comm.c
index b22e355..7da3de2 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -83,7 +83,7 @@ Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/csplit.c b/src/csplit.c
index 14d2ba3..ebc9306 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1529,7 +1529,7 @@ Read standard input if FILE is -.  Each PATTERN may be:\n\
 \n\
 A line OFFSET is a required `+' or `-' followed by a positive integer.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/cut.c b/src/cut.c
index be16403..d9592d1 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -205,7 +205,7 @@ range, or many ranges separated by commas.  Each range is one of:\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/expand.c b/src/expand.c
index 3d97dd1..1ce8ac7 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -128,7 +128,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/fmt.c b/src/fmt.c
index ec0ce24..f86513f 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -294,7 +294,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 In -wNUMBER, the letter `w' may be omitted.\n"),
             stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/fold.c b/src/fold.c
index 084258b..be1d669 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -83,7 +83,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/head.c b/src/head.c
index 23c29f5..f0879a1 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -112,7 +112,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/join.c b/src/join.c
index 94417db..b6f2c69 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -177,7 +177,7 @@ each being `SIDE.FIELD' or `0'.  Default FORMAT outputs the join field,\n\
 the remaining fields from FILE1, the remaining fields from FILE2, all\n\
 separated by CHAR.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/md5sum.c b/src/md5sum.c
index a5a31d0..b7e6f4b 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -154,7 +154,7 @@ should be a former output of this program.  The default mode is to print\n\
 a line with checksum, a character indicating type (`*' for binary, ` ' for\n\
 text), and name for each FILE.\n"),
              (algorithm == ALG_MD5 ? "RFC 1321" : "FIPS-180-1"));
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
 
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/nl.c b/src/nl.c
index 41b4559..5204380 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -224,7 +224,7 @@ FORMAT is one of:\n\
   rz   right justified, leading zeros\n\
 \n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/od.c b/src/od.c
index 2e3f7f9..6c0de18 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -371,7 +371,7 @@ of output.  \
 --string without a number implies 3.  --width without a number\n\
 implies 32.  By default, od uses -A o -t d2 -w 16.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/paste.c b/src/paste.c
index 0c61562..3814c5a 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -420,7 +420,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       /* FIXME: add a couple of examples.  */
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/pr.c b/src/pr.c
index cae03f0..f5b22cc 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -2861,7 +2861,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 -T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n\
 FILE is -, read standard input.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/sort.c b/src/sort.c
index 999de40..9d1b8ac 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -343,7 +343,7 @@ The locale specified by the environment affects sort order.\n\
 Set LC_ALL=C to get the traditional sort order that uses\n\
 native byte values.\n\
 "), stdout );
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   /* Don't use EXIT_FAILURE here in case it is defined to be 1.
      POSIX requires that sort return 1 IFF invoked with -c and

diff --git a/src/split.c b/src/split.c
index 2cc3055..f470395 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -120,7 +120,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/sum.c b/src/sum.c
index ced371e..302ade0 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -73,7 +73,7 @@ Print checksum and block counts for each FILE.\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/tac.c b/src/tac.c
index 6e75aa3..b0da18f 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -143,7 +143,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/tail.c b/src/tail.c
index c759d48..3ab262d 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -301,7 +301,7 @@ rotation).  Use --follow=name in that case.  That causes tail to track the\n\
 named file by reopening it periodically to see if it has been removed and\n\
 recreated by some other program.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/tr.c b/src/tr.c
index b08c218..e931990 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -393,7 +393,7 @@ only be used in pairs to specify case conversion.  \
 translating nor deleting; else squeezing uses SET2 and occurs after\n\
 translation or deletion.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/tsort.c b/src/tsort.c
index f08795f..c8a8735 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -102,7 +102,7 @@ With no FILE, or when FILE is -, read standard input.\n\
 "), program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
 
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/unexpand.c b/src/unexpand.c
index dec4904..3b830d7 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -381,17 +381,17 @@ Convert spaces in each FILE to tabs, writing to standard output.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
 "), stdout);
-     fputs (_("\
+      fputs (_("\
 Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
-     fputs (_("\
+      fputs (_("\
   -a, --all           convert all whitespace, instead of initial whitespace\n\
   -t, --tabs=NUMBER   have tabs NUMBER characters apart instead of 8\n\
   -t, --tabs=LIST     use comma separated list of explicit tab positions\n\
 "), stdout);
-     fputs (HELP_OPTION_DESCRIPTION, stdout);
-     fputs (VERSION_OPTION_DESCRIPTION, stdout);
-     puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/uniq.c b/src/uniq.c
index 78d0099..1dd037a 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -166,7 +166,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 A field is a run of whitespace, then non-whitespace characters.\n\
 Fields are skipped before chars.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }

diff --git a/src/wc.c b/src/wc.c
index 970497a..062a7dd 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -143,7 +143,7 @@ read standard input.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }