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

diff --git a/src/cat.c b/src/cat.c
index 935c1afaa190faeb64f2c1216b6a7aafee0bd15d..eb3cd5a4da08b2448c0713e3d3ef90d937be6622 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 f98d27ddd5838ff806fe2251a62cae4a54478e43..7d0fdc75da048b73fa1e79982e6eb190bd3e50fd 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 b22e355530a21e98b04e1839e13e5e8b908bd677..7da3de20bd8cecb2c438bda2d5e7441c767ef41e 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 14d2ba365b0ecea5ea980568bcdd6b9657cbcedf..ebc930686e24845cee28f12cb80123a0339dce72 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 be164030e23440dc748772cadeb4ee1ef3054b20..d9592d16b80ae2b016fceb971c839cca330691cc 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 3d97dd1e8603aa116b97e37bf104982a8b03e381..1ce8ac72c3a851ef4356b0feb765a307f7d22e1b 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 ec0ce24535a4731e50e34b44229878693ee0c527..f86513f33cbd34a99b5848fcd217b319c451b9f8 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 084258bd53c71f9157f01f29e2f20f3c42dad6e4..be1d669da37bb0aa562d62d91151998be2a8cc95 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 23c29f58c3289bc5e9004326a3eb714492e8858d..f0879a1d10f3f0bfd351c4165bf3743b6e1b0f6b 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 94417db1927b24460b9540a24b76f6d205bbd79e..b6f2c692267869fc590f84638fd606a4765b740e 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 a5a31d09f1ce518598e2e24d629763bb26e9b2b5..b7e6f4b723d77f505b7ec48f1f7b785e10d89ce1 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 41b4559f9c4e7955265ce3a5f7b325f8c8f6ec34..5204380fcfbd9fcc3ed23c193cdded8ad3d9a5ae 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 2e3f7f9f28852cd32f3cfec820d56758cb58ae6c..6c0de1874e0b4f765a6c66382b81c1fb96cd6cf1 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 0c61562878a7dd1f7e2a56094ff7b21646e75871..3814c5a088b38998a5073869b9425eb472de9683 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 cae03f06907c3a2d90103ade01056859185dbe3f..f5b22cc0578a865b6a22b59ec3bef4baf9052127 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 999de4015957150a481c305d43c9d2f5d9d2c237..9d1b8ac35b274a086c64917d9a4becaf785c6734 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 2cc3055895b0bb42f352c965f0fb7284231692a1..f4703952988e50f82a9eb86b29f2044aa6107791 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 ced371e8c4b82b3defea0bff2717931fe3ab08cf..302ade014ff5fff74b49139c0be5eb8da789f813 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 6e75aa357a555941e564502b2c7d2892a62c3724..b0da18ff46b6552fadd85344563b7c6fce6ab6be 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 c759d489368fb20e64ce21025c312139fb1b0482..3ab262d0318f556795aad69cc28111b33fff2d6a 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 b08c21804712ef2ec473708d1ef276a60f71752e..e931990ce6c345a8ad4d66c82f4b8956db5bd802 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 f08795fda606a2f23329224b3f9851b3d194df04..c8a8735847ce1c1628974810119aae03dbc77516 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 dec49042bdedef185fd9ae76eb3eb205ad32f29c..3b830d77135e6abec52a58993420a95f8cd87ace 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 78d0099b5a017d879693331707c9148c38efa4db..1dd037a40a8c241670eb7a2c0dbbf6261b06dad1 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 970497ac844b4d739619ffdd3882c8e0cae16ec8..062a7dd057074a7020f433a18e932bdb470132c4 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);
 }