diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/sysdep.h | 12 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/opintl.h | 13 |
4 files changed, 35 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 03fc856..798ed4d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2000-05-31 Nick Clifton <nickc@cygnus.com> + + * opintl.h (_(String)): Explain why dgettext is used instead + of gettext. + 2000-05-31 Ulrich Drepper <drepper@redhat.com> * elf.c (_bfd_elf_slurp_version_tables): Correct reading of version diff --git a/bfd/sysdep.h b/bfd/sysdep.h index 77b5e50..bf3eac0 100644 --- a/bfd/sysdep.h +++ b/bfd/sysdep.h @@ -126,6 +126,18 @@ extern char *getenv (); #ifdef ENABLE_NLS #include <libintl.h> +/* Note the use of dgetext() and PACKAGE here, rather than gettext(). + + This is because the code in this directory is used to build a library which + will be linked with code in other directories to form programs. We want to + maintain a seperate translation file for this directory however, rather + than being forced to merge it with that of any program linked to libbfd. + This is a library, so it cannot depend on the catalog currently loaded. + + In order to do this, we have to make sure that when we extract messages we + use the OPCODES domain rather than the domain of the program that included + the bfd library, (eg OBJDUMP). Hence we use dgettext (PACKAGE, String) + and define PACKAGE to be 'bfd'. (See the code in configure). */ #define _(String) dgettext (PACKAGE, String) #ifdef gettext_noop #define N_(String) gettext_noop (String) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 08b2c16..a2c890f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2000-05-31 Nick Clifton <nickc@cygnus.com> + + * opintl.h (_(String)): Explain why dgettext is used instead of + gettext. + 2000-05-30 Nick Clifton <nickc@cygnus.com> * opintl.h (gettext, dgettext, dcgettext, textdomain, diff --git a/opcodes/opintl.h b/opcodes/opintl.h index 55a989a..492fc1a 100644 --- a/opcodes/opintl.h +++ b/opcodes/opintl.h @@ -12,6 +12,19 @@ #ifdef ENABLE_NLS # include <libintl.h> +/* Note the use of dgetext() and PACKAGE here, rather than gettext(). + + This is because the code in this directory is used to build a library which + will be linked with code in other directories to form programs. We want to + maintain a seperate translation file for this directory however, rather + than being forced to merge it with that of any program linked to + libopcodes. This is a library, so it cannot depend on the catalog + currently loaded. + + In order to do this, we have to make sure that when we extract messages we + use the OPCODES domain rather than the domain of the program that included + the opcodes library, (eg OBJDUMP). Hence we use dgettext (PACKAGE, String) + and define PACKAGE to be 'opcodes'. (See the code in configure). */ # define _(String) dgettext (PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) |