This is for GNU Diffutils, which is still using the old way
of also translating Gnulib’s msgids.
* lib/gettext.h (GNULIB_TEXT_DOMAIN): New macro.
* lib/argmatch.c, lib/bitset/stats.c, lib/c-stack.c:
* lib/clean-temp-simple.c, lib/clean-temp-simple.c, lib/clean-temp.c:
* lib/closein.c, lib/closeout.c, lib/copy-acl.c, lib/copy-file.c:
* lib/csharpcomp.c, lib/csharpexec.c, lib/cygpath.c, lib/dfa.c:
* lib/error.c, lib/execute.c, lib/gai_strerror.c, lib/getaddrinfo.c:
* lib/getopt.c, lib/javacomp.c, lib/javaexec.c, lib/javaversion.c:
* lib/mkdir-p.c, lib/obstack.c, lib/openat-die.c, lib/os2-spawn.c:
* lib/pagealign_alloc.c, lib/parse-datetime.y, lib/pipe-filter-gi.c:
* lib/pipe-filter-ii.c, lib/quotearg.c, lib/rpmatch.c, lib/set-acl.c:
* lib/sigpipe-die.c, lib/spawn-pipe.c, lib/strsignal.c, lib/timevar.c:
* lib/unicodeio.c, lib/userspec.c, lib/vc-mtime.c, lib/version-etc.c:
* lib/wait-process.c, lib/windows-cygpath.c, lib/xalloc-die.c:
* lib/xbinary-io.c, lib/xfreopen.c, lib/xmemcoll.c, lib/xprintf.c:
* lib/xsetenv.c, lib/xstdopen.c, lib/xstrerror.c, lib/xstrtol-error.c:
(_): Use GNULIB_TEXT_DOMAIN instead of "gnulib" when calling dgettext.
* lib/argmatch.h (ARGMATCH_DEFINE_GROUP):
* lib/file-type.c (file_type):
* lib/regex_internal.h (gettext) [HAVE_LIBINTL_H & ENABLE_NLS & !_LIBC]:
* lib/xstrtol-error.c (xstrtol_error):
Likewise.
---
ChangeLog | 27 +++++++++++++++++++++++++++
doc/gnulib-tool.texi | 5 +++++
lib/argmatch.c | 2 +-
lib/argmatch.h | 2 +-
lib/bitset/stats.c | 2 +-
lib/c-stack.c | 2 +-
lib/clean-temp-simple.c | 2 +-
lib/clean-temp.c | 2 +-
lib/closein.c | 2 +-
lib/closeout.c | 2 +-
lib/copy-acl.c | 2 +-
lib/copy-file.c | 2 +-
lib/csharpcomp.c | 2 +-
lib/csharpexec.c | 2 +-
lib/cygpath.c | 2 +-
lib/dfa.c | 2 +-
lib/error.c | 2 +-
lib/execute.c | 2 +-
lib/file-type.c | 2 +-
lib/gai_strerror.c | 2 +-
lib/getaddrinfo.c | 2 +-
lib/getopt.c | 2 +-
lib/gettext.h | 6 ++++++
lib/javacomp.c | 2 +-
lib/javaexec.c | 2 +-
lib/javaversion.c | 2 +-
lib/mkdir-p.c | 2 +-
lib/obstack.c | 2 +-
lib/openat-die.c | 2 +-
lib/os2-spawn.c | 2 +-
lib/pagealign_alloc.c | 2 +-
lib/parse-datetime.y | 2 +-
lib/pipe-filter-gi.c | 2 +-
lib/pipe-filter-ii.c | 2 +-
lib/quotearg.c | 2 +-
lib/regex_internal.h | 2 +-
lib/rpmatch.c | 2 +-
lib/set-acl.c | 2 +-
lib/sigpipe-die.c | 2 +-
lib/spawn-pipe.c | 2 +-
lib/strsignal.c | 2 +-
lib/timevar.c | 2 +-
lib/unicodeio.c | 2 +-
lib/userspec.c | 2 +-
lib/vc-mtime.c | 2 +-
lib/version-etc.c | 2 +-
lib/wait-process.c | 2 +-
lib/windows-cygpath.c | 2 +-
lib/xalloc-die.c | 2 +-
lib/xbinary-io.c | 2 +-
lib/xfreopen.c | 2 +-
lib/xmemcoll.c | 2 +-
lib/xprintf.c | 2 +-
lib/xsetenv.c | 2 +-
lib/xstdopen.c | 2 +-
lib/xstrerror.c | 2 +-
lib/xstrtol-error.c | 5 +++--
57 files changed, 94 insertions(+), 55 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e0ff49b4a..013d9833c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2025-09-09 Paul Eggert <egg...@cs.ucla.edu>
+
+ gettext-h: support overriding "gnulib"
+ This is for GNU Diffutils, which is still using the old way
+ of also translating Gnulib’s msgids.
+ * lib/gettext.h (GNULIB_TEXT_DOMAIN): New macro.
+ * lib/argmatch.c, lib/bitset/stats.c, lib/c-stack.c:
+ * lib/clean-temp-simple.c, lib/clean-temp-simple.c, lib/clean-temp.c:
+ * lib/closein.c, lib/closeout.c, lib/copy-acl.c, lib/copy-file.c:
+ * lib/csharpcomp.c, lib/csharpexec.c, lib/cygpath.c, lib/dfa.c:
+ * lib/error.c, lib/execute.c, lib/gai_strerror.c, lib/getaddrinfo.c:
+ * lib/getopt.c, lib/javacomp.c, lib/javaexec.c, lib/javaversion.c:
+ * lib/mkdir-p.c, lib/obstack.c, lib/openat-die.c, lib/os2-spawn.c:
+ * lib/pagealign_alloc.c, lib/parse-datetime.y, lib/pipe-filter-gi.c:
+ * lib/pipe-filter-ii.c, lib/quotearg.c, lib/rpmatch.c, lib/set-acl.c:
+ * lib/sigpipe-die.c, lib/spawn-pipe.c, lib/strsignal.c, lib/timevar.c:
+ * lib/unicodeio.c, lib/userspec.c, lib/vc-mtime.c, lib/version-etc.c:
+ * lib/wait-process.c, lib/windows-cygpath.c, lib/xalloc-die.c:
+ * lib/xbinary-io.c, lib/xfreopen.c, lib/xmemcoll.c, lib/xprintf.c:
+ * lib/xsetenv.c, lib/xstdopen.c, lib/xstrerror.c, lib/xstrtol-error.c:
+ (_): Use GNULIB_TEXT_DOMAIN instead of "gnulib" when calling dgettext.
+ * lib/argmatch.h (ARGMATCH_DEFINE_GROUP):
+ * lib/file-type.c (file_type):
+ * lib/regex_internal.h (gettext) [HAVE_LIBINTL_H & ENABLE_NLS & !_LIBC]:
+ * lib/xstrtol-error.c (xstrtol_error):
+ Likewise.
+
2025-09-09 Bruno Haible <br...@clisp.org>
Remove support for OSF/1.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index e9ee83703c..009a25ce61 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -1114,6 +1114,11 @@ translatable strings to be included in your POT file.
When you send
this POT file to the Translation Project, translators will normally fill
in the translations of the Gnulib strings from their ``translation
memory'', and send you back updated PO files.
+For this to work, your program should define the macro
+@code{GNULIB_TEXT_DOMAIN} to its own textdomain name early,
+before including @file{gettext.h};
+you can do this by putting @code{AC_DEFINE([GNULIB_TEXT_DOMAIN], [PACKAGE])}
+in your @file{configure.ac}.
However, this process is error-prone: you might forget to list some
source files, or the translator might not be using a translation memory
diff --git a/lib/argmatch.c b/lib/argmatch.c
index 0aee39c1ee..e9b7c66a72 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include <error.h>
#include "quotearg.h"
diff --git a/lib/argmatch.h b/lib/argmatch.h
index 54bd1fcf64..4eac4ac938 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -239,7 +239,7 @@ char const *argmatch_to_argument (void const *value,
\
/* Try to put synonyms on the same line. Synonyms are expected \
to follow each other. */ \
- fputs (dgettext ("gnulib", "Valid arguments are:"), out); \
+ fputs (dgettext (GNULIB_TEXT_DOMAIN, "Valid arguments are:"), out); \
for (int i = 0; g->args[i].arg; i++) \
if (i == 0 \
|| memcmp (&g->args[i-1].val, &g->args[i].val, size)) \
diff --git a/lib/bitset/stats.c b/lib/bitset/stats.c
index ec1bf758bd..738c76a790 100644
--- a/lib/bitset/stats.c
+++ b/lib/bitset/stats.c
@@ -33,7 +33,7 @@
#include <string.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "bitset/array.h"
#include "bitset/base.h"
diff --git a/lib/c-stack.c b/lib/c-stack.c
index 794ef95913..f8321f871c 100644
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -56,7 +56,7 @@
#include "ignore-value.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Here we need the original abort() function. (Printing a stack trace
from within a signal handler is not going to work in most cases anyway.) */
diff --git a/lib/clean-temp-simple.c b/lib/clean-temp-simple.c
index 95103b8ac0..aae2290daa 100644
--- a/lib/clean-temp-simple.c
+++ b/lib/clean-temp-simple.c
@@ -38,7 +38,7 @@
#include "hashkey-string.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Lock that protects the file_cleanup_list from concurrent modification in
diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index e8d0cf3113..a0b7ed99f6 100644
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -66,7 +66,7 @@
# include "stdio--.h"
#endif
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* GNU Hurd doesn't have PATH_MAX. Use a fallback.
Temporary directory names are usually not that long. */
diff --git a/lib/closein.c b/lib/closein.c
index aec0f13282..5db106fb52 100644
--- a/lib/closein.c
+++ b/lib/closein.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "close-stream.h"
#include "closeout.h"
diff --git a/lib/closeout.c b/lib/closeout.c
index 5cae504e11..d3a09c8776 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "close-stream.h"
#include <error.h>
diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 2fce6c7d46..a92740899c 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -26,7 +26,7 @@
#include "quote.h"
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Copy access control lists from one file to another. If SOURCE_DESC is
diff --git a/lib/copy-file.c b/lib/copy-file.c
index ddcee13f34..56af147b52 100644
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -39,7 +39,7 @@
#include "quote.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
enum { IO_SIZE = 32 * 1024 };
diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index 5b6c9684d9..bda064b686 100644
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.c
@@ -40,7 +40,7 @@
#include "xvasprintf.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Survey of C# compilers.
diff --git a/lib/csharpexec.c b/lib/csharpexec.c
index 13a05a7e73..3852424229 100644
--- a/lib/csharpexec.c
+++ b/lib/csharpexec.c
@@ -76,7 +76,7 @@
#undef new_classpath
#undef CLASSPATHVAR
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Survey of CIL interpreters.
diff --git a/lib/cygpath.c b/lib/cygpath.c
index 97212b6d44..d8c984c330 100644
--- a/lib/cygpath.c
+++ b/lib/cygpath.c
@@ -26,7 +26,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#ifdef __CYGWIN__
diff --git a/lib/dfa.c b/lib/dfa.c
index 284f10da3f..d0011afc48 100644
--- a/lib/dfa.c
+++ b/lib/dfa.c
@@ -39,7 +39,7 @@
#include "localeinfo.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#if GAWK
/* Use ISO C 99 API. */
diff --git a/lib/error.c b/lib/error.c
index 9231c79c83..ab4c38f339 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -38,7 +38,7 @@
#if !_LIBC && ENABLE_NLS
# include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#endif
#ifdef _LIBC
diff --git a/lib/execute.c b/lib/execute.c
index 3d51e2eb5d..2d09750c7a 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -40,7 +40,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Choice of implementation for native Windows.
diff --git a/lib/file-type.c b/lib/file-type.c
index c1ccf1f546..1639ae6756 100644
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -27,5 +27,5 @@
char const *
file_type (struct stat const *st)
{
- return dgettext ("gnulib", c_file_type (st));
+ return dgettext (GNULIB_TEXT_DOMAIN, c_file_type (st));
}
diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index 9c5f141948..df9d7e6be8 100644
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -27,7 +27,7 @@
# include <libintl.h>
#else
# include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
# define N_(msgid) msgid
#endif
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index a8c45c21c2..c022c92f2d 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -40,7 +40,7 @@
#include <stdio.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define N_(msgid) msgid
/* BeOS has AF_INET, but not PF_INET. */
diff --git a/lib/getopt.c b/lib/getopt.c
index 6b155e6c63..d61bf8619c 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -42,7 +42,7 @@
# define funlockfile(fp) _IO_funlockfile (fp)
#else
# include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* When used standalone, flockfile and funlockfile might not be
available. */
# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
diff --git a/lib/gettext.h b/lib/gettext.h
index fd6c62b7eb..214a0022d8 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -347,5 +347,11 @@ dcnpgettext_expr (const char *domain,
return (n == 1 ? msgid : msgid_plural);
}
+/* The text domainname for Gnulib messages. Ordinarily this is "gnulib",
+ but packages that do their own translations of Gnulib can use
+ something different by defining GNULIB_TEXT_DOMAIN early. */
+#ifndef GNULIB_TEXT_DOMAIN
+# define GNULIB_TEXT_DOMAIN "gnulib"
+#endif
#endif /* _LIBGETTEXT_H */
diff --git a/lib/javacomp.c b/lib/javacomp.c
index ff18f79e35..1c01a8d077 100644
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -50,7 +50,7 @@
#include "c-strstr.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Survey of Java compilers.
diff --git a/lib/javaexec.c b/lib/javaexec.c
index 1158971ff9..7e637f3533 100644
--- a/lib/javaexec.c
+++ b/lib/javaexec.c
@@ -35,7 +35,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Survey of Java virtual machines.
diff --git a/lib/javaversion.c b/lib/javaversion.c
index bd680354a4..ea107f48d5 100644
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -37,7 +37,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Get PKGDATADIR. */
#include "configmake.h"
diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 7b764f122d..6c10819401 100644
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "dirchownmod.h"
#include "dirname.h"
diff --git a/lib/obstack.c b/lib/obstack.c
index d6d1510b09..8c4a5d55ab 100644
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -337,7 +337,7 @@ _obstack_memory_used (struct obstack *h)
# else
# include "gettext.h"
# ifndef _
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
# endif
# endif
diff --git a/lib/openat-die.c b/lib/openat-die.c
index 79a5b23bc8..589dbd1504 100644
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -28,7 +28,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
_Noreturn void
openat_save_fail (int errnum)
diff --git a/lib/os2-spawn.c b/lib/os2-spawn.c
index 7decf1b580..0bdf27162b 100644
--- a/lib/os2-spawn.c
+++ b/lib/os2-spawn.c
@@ -38,7 +38,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Duplicates a file handle, making the copy uninheritable.
diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index e460356c3f..b027e78fc6 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -36,7 +36,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#if HAVE_MMAP
/* Define MAP_FILE when it isn't otherwise. */
diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y
index c120eae04a..a17b631d02 100644
--- a/lib/parse-datetime.y
+++ b/lib/parse-datetime.y
@@ -60,7 +60,7 @@
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers
use _STDLIB_H_ as witness. Map the latter to the one bison uses. */
diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c
index c8b29c5852..a04da1c461 100644
--- a/lib/pipe-filter-gi.c
+++ b/lib/pipe-filter-gi.c
@@ -39,7 +39,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "pipe-filter-aux.h"
diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c
index f63343ed1f..ff7a2dfff6 100644
--- a/lib/pipe-filter-ii.c
+++ b/lib/pipe-filter-ii.c
@@ -158,7 +158,7 @@ WaitForMultipleObjects (DWORD nCount, const HANDLE
*pHandles, BOOL bWaitAll,
#include "wait-process.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "pipe-filter-aux.h"
diff --git a/lib/quotearg.c b/lib/quotearg.c
index 7de7555238..325f3d9172 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -44,7 +44,7 @@
#include <wchar.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define N_(msgid) msgid
#ifndef SIZE_MAX
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 1f2972999a..855025e13b 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -105,7 +105,7 @@
# define gettext(msgid) \
__dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
# else
-# define gettext(msgid) dgettext ("gnulib", msgid)
+# define gettext(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
# endif
#else
# undef gettext
diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 0e7e6c3c36..b1f06e3a54 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -33,7 +33,7 @@
# endif
# include <regex.h>
# include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
# define N_(msgid) gettext_noop (msgid)
# if HAVE_LANGINFO_YESEXPR
diff --git a/lib/set-acl.c b/lib/set-acl.c
index 8f54029873..36d80c65aa 100644
--- a/lib/set-acl.c
+++ b/lib/set-acl.c
@@ -26,7 +26,7 @@
#include "quote.h"
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Set the access control lists of a file to match *exactly* MODE (this might
remove inherited ACLs). Note chmod() tends to honor inherited/default
diff --git a/lib/sigpipe-die.c b/lib/sigpipe-die.c
index ddd05cd49c..bc0ce327cb 100644
--- a/lib/sigpipe-die.c
+++ b/lib/sigpipe-die.c
@@ -28,7 +28,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
void
sigpipe_die (void)
diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c
index 098352e2d5..cd27addd4b 100644
--- a/lib/spawn-pipe.c
+++ b/lib/spawn-pipe.c
@@ -43,7 +43,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Choice of implementation for native Windows.
diff --git a/lib/strsignal.c b/lib/strsignal.c
index 738468afaa..86653b3ac0 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -30,7 +30,7 @@
# include <libintl.h>
#else /* !_LIBC */
# include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
# define N_(msgid) gettext_noop (msgid)
#endif /* _LIBC */
diff --git a/lib/timevar.c b/lib/timevar.c
index 8b2ea104be..7e9f08728f 100644
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -32,7 +32,7 @@
#include "gethrxtime.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include "xalloc.h"
/* See timevar.h for an explanation of timing variables. */
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index addaf7d839..5d3d27f48d 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -33,7 +33,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define N_(msgid) msgid
#include "localcharset.h"
diff --git a/lib/userspec.c b/lib/userspec.c
index bae72c97c0..7c5088eb06 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -43,7 +43,7 @@
#include "xstrtol.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define N_(msgid) msgid
#ifndef HAVE_ENDGRENT
diff --git a/lib/vc-mtime.c b/lib/vc-mtime.c
index 77acbabba4..4f867d694a 100644
--- a/lib/vc-mtime.c
+++ b/lib/vc-mtime.c
@@ -49,7 +49,7 @@
#endif
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* ==========================================================================
*/
diff --git a/lib/version-etc.c b/lib/version-etc.c
index 703d7fcf4e..bb108ffd2f 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -29,7 +29,7 @@
#endif
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* If you use AM_INIT_AUTOMAKE's no-define option,
PACKAGE is not defined. Use PACKAGE_TARNAME instead. */
diff --git a/lib/wait-process.c b/lib/wait-process.c
index e95f98c7a7..c2331bb522 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -34,7 +34,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
diff --git a/lib/windows-cygpath.c b/lib/windows-cygpath.c
index 8b11898e3d..6ac1458196 100644
--- a/lib/windows-cygpath.c
+++ b/lib/windows-cygpath.c
@@ -24,7 +24,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#if defined _WIN32 && !defined __CYGWIN__
diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index db1ee8ffe2..c3f3961add 100644
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -26,7 +26,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
void
xalloc_die (void)
diff --git a/lib/xbinary-io.c b/lib/xbinary-io.c
index 67f209ee9d..90e49d99ed 100644
--- a/lib/xbinary-io.c
+++ b/lib/xbinary-io.c
@@ -25,7 +25,7 @@
#include "verify.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#if O_BINARY
diff --git a/lib/xfreopen.c b/lib/xfreopen.c
index 6f775bbee4..9f82eda958 100644
--- a/lib/xfreopen.c
+++ b/lib/xfreopen.c
@@ -23,7 +23,7 @@
#include "quote.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
void
xfreopen (char const *filename, char const *mode, FILE *fp)
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index d1b141c9e0..53eefe4d19 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#include <error.h>
#include "exitfail.h"
diff --git a/lib/xprintf.c b/lib/xprintf.c
index 790af5320b..1863876eb0 100644
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -26,7 +26,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
off64_t
xprintf (char const *restrict format, ...)
diff --git a/lib/xsetenv.c b/lib/xsetenv.c
index 7dfa3fcd87..79f03d3892 100644
--- a/lib/xsetenv.c
+++ b/lib/xsetenv.c
@@ -24,7 +24,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
/* Set NAME to VALUE in the environment.
diff --git a/lib/xstdopen.c b/lib/xstdopen.c
index b6dca48252..834ef757d3 100644
--- a/lib/xstdopen.c
+++ b/lib/xstdopen.c
@@ -24,7 +24,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
void
xstdopen (void)
diff --git a/lib/xstrerror.c b/lib/xstrerror.c
index 00e2a5bc8b..ce65887c47 100644
--- a/lib/xstrerror.c
+++ b/lib/xstrerror.c
@@ -25,7 +25,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
char *
xstrerror (const char *message, int errnum)
diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 16a72d6773..b11e0c4873 100644
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -25,7 +25,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#define N_(msgid) msgid
/* Report an error for an invalid integer in an option argument.
@@ -84,7 +84,8 @@ xstrtol_error (enum strtol_error err,
else
option = long_options[opt_idx].name;
- error (exit_status, 0, dgettext ("gnulib", msgid), hyphens, option, arg);
+ error (exit_status, 0, dgettext (GNULIB_TEXT_DOMAIN, msgid),
+ hyphens, option, arg);
}
/* Like xstrtol_error, except exit with a failure status. */
--
2.48.1
