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

diff --git a/src/chgrp.c b/src/chgrp.c
index aea989235ab2f43cd5d95743c09e1d9c4dcb8c46..3253b0fb50461314426b8381c4ad7003c59511c1 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -149,7 +149,7 @@ Change the group membership of each FILE to GROUP.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/chmod.c b/src/chmod.c
index 24f1381a551249f2aa4a56d59902fde1e83b6bf3..852fe47e6327eef763e54e0981af90eb649bd29b 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -262,7 +262,7 @@ Change the mode of each FILE to MODE.\n\
 Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n\
 one or more of the letters rwxXstugo.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/chown.c b/src/chown.c
index 9a602d302e2ab4d8527b13dbf23651fec551f227..a95ff017e761c13bde6c8a2fc670be8dcdb5a338 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -136,7 +136,7 @@ Owner is unchanged if missing.  Group is unchanged if missing, but changed\n\
 to login group if implied by a `:'.  OWNER and GROUP may be numeric as well\n\
 as symbolic.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/cp.c b/src/cp.c
index 41fe2b247e27aba17c5029fe533a41b92b3e9ce2..676e2fbaa993011407ec85a0971ef2b8c17f76d4 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -254,7 +254,7 @@ As a special case, cp makes a backup of SOURCE when the force and backup\n\
 options are given and SOURCE and DEST are the same name for an existing,\n\
 regular file.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/dd.c b/src/dd.c
index 0b84cdaa585131ae3d3646d5be467ec6ddde5940..c394a9499a8acad99a9457562b4f90de7f851a6a 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -331,7 +331,7 @@ Each KEYWORD may be:\n\
   sync      pad every input block with NULs to ibs-size; when used\n\
               with block or unblock, pad with spaces rather than NULs\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/df.c b/src/df.c
index b44498171fdcf1c0f2de7084b190f66868eebc69..af4b7e390586baf66441baef175081fc18e226be 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -790,7 +790,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 SIZE may be (or may be an integer optionally followed by) one of following:\n\
 kB 1000, K 1024, MB 1,000,000, M 1,048,576, and so on for G, T, P, E, Z, Y.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/dircolors.c b/src/dircolors.c
index 46ccc010e0fc8229fdb7a74077faef634fda819e..f9b6c14883cfab2829d54d5239d29c737cd12ba4 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -118,7 +118,7 @@ If FILE is specified, read it to determine which colors to use for which\n\
 file types and extensions.  Otherwise, a precompiled database is used.\n\
 For details on the format of these files, run `dircolors --print-database'.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
 
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/du.c b/src/du.c
index edb883f0cc9ece7b00c427474bc244c577cc9fe7..61f9ce13cb74eff16b88560d64ca0bb25b71348c 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -226,7 +226,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 SIZE may be (or may be an integer optionally followed by) one of following:\n\
 kB 1000, K 1024, MB 1,000,000, M 1,048,576, and so on for G, T, P, E, Z, Y.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/install.c b/src/install.c
index 9c8dd3608cb5e9384a3cb07b2f3b6ae0a58d588e..0d1bc09426a87c3494ffd6d561c4b44804c6c649 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -649,7 +649,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/link.c b/src/link.c
index cf9c657d7c8a801b75a8471d563578eff07d223a..d5c655ba3b595472410cf7ab9d2f0d83f634f4b7 100644 (file)
--- a/src/link.c
+++ b/src/link.c
@@ -56,7 +56,7 @@ Usage: %s FILE1 FILE2\n\
             stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/ln.c b/src/ln.c
index 1b7a87a0ed21697c9e8614b73fa669ca7d4653b7..82c347b746a4c625dc34c895fb6e9cda8d494877 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -387,7 +387,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/ls.c b/src/ls.c
index fe702d82b3b54cf8b7614dc1733be9897690cec8..fd0941d7366f940e9f028037f2b47d891ffc34bc 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -3714,7 +3714,7 @@ optional WHEN argument is equivalent to using --color=always.  With\n\
 --color=auto, color codes are output only if standard output is connected\n\
 to a terminal (tty).\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/mkdir.c b/src/mkdir.c
index 2b00c2f6d61453c1c07db48a9a98870de5552cdb..75e44fd22117c8dcdd3ea0550931353c3e2569b3 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -73,7 +73,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-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 9972030127af578afb7b77fea8965a929cc5fae2..ed6736064fc7e0666426e6351e71ee01db2ad98a 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -65,7 +65,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-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/mknod.c b/src/mknod.c
index 810d63ef38bebd0167f1e1ea0c74b971a2e6ae18..104426dadd6cd6a0fc8c285fcf962425d36bb670 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -83,7 +83,7 @@ MAJOR MINOR are forbidden for TYPE p, mandatory otherwise.  TYPE may be:\n\
   c, u   create a character (unbuffered) special file\n\
   p      create a FIFO\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/mv.c b/src/mv.c
index c8e504e287caae412af65ebb4399c7b39bcd5e62..2bea3315d0908d6d2a8ad9902ec5f564195b4a29 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -363,7 +363,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/rm.c b/src/rm.c
index 0a3899facf64fa2439e97b1baed84e68716cd7b7..d34c1933adf97ebd8b8edf5b5afdc3870a24ab9b 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -111,7 +111,7 @@ Note that if you use rm to remove a file, it is usually possible to recover\n\
 the contents of that file.  If you want more assurance that the contents are\n\
 truly unrecoverable, consider using shred.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/rmdir.c b/src/rmdir.c
index cebeac31672d93ae3638c9bf22306bc26a1556b3..bacc911f0312ec95c3d7ce5b24e37ff07b48557f 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -157,7 +157,7 @@ Remove the DIRECTORY(ies), if they are empty.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/shred.c b/src/shred.c
index 04a9b5b01bb836a35745b97ec740d35d6407ebde..fb77dcade57dbd7fc747f10dc5335ea394a99615 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -231,7 +231,7 @@ In addition, file system backups and remote mirrors may contain copies\n\
 of the file that cannot be removed, and that will allow a shredded file\n\
 to be recovered later.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/stat.c b/src/stat.c
index c620c557842d756e56ee885c7ac7f94ee00a58be..9d1f87a492dd2fcad99fbb2199774c3ce1924244 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -930,7 +930,7 @@ Valid format sequences for file systems:\n\
   %T - Type in human readable form\n\
   %t - Type in hex\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/sync.c b/src/sync.c
index 40bb5715b74a6df45abc655f59b964368d439996..2e101576443ad7de5c42d2a9cd9697e4999f2cb9 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -48,7 +48,7 @@ Force changed blocks to disk, update the super block.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/touch.c b/src/touch.c
index 1d43c300bf2584864a081d0b1f39fd0e1f2c66f9..9a0b81c1e124eac43bf3a83b327099811ae5e7cd 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -262,7 +262,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 Note that the -d and -t options accept different time-date formats.\n\
 "), stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }

diff --git a/src/unlink.c b/src/unlink.c
index f6c57c4bf847ff9db7efb240923b1af76b341895..bec995bddbfe0296219ad4440015072680d86409 100644 (file)
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -55,7 +55,7 @@ Usage: %s FILE\n\
             stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }