textdomain

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 285763e..702eb51 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -5285,8 +5285,8 @@ install-po:
          dir=$(localedir)/$$lang/LC_MESSAGES; \
          echo $(mkinstalldirs) $(DESTDIR)$$dir; \
          $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
-         echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
-         $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
+         echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \
+         $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \
        done
 
 # Rule for regenerating the message template (gcc.pot).

diff --git a/gcc/intl.c b/gcc/intl.c
index 262745f..8477a09 100644 (file)
--- a/gcc/intl.c
+++ b/gcc/intl.c
@@ -55,8 +55,8 @@ gcc_init_libintl (void)
   setlocale (LC_ALL, "");
 #endif
 
-  (void) bindtextdomain ("gcc", LOCALEDIR);
-  (void) textdomain ("gcc");
+  (void) bindtextdomain ("gcc-4.7", LOCALEDIR);
+  (void) textdomain ("gcc-4.7");
 
   /* Opening quotation mark.  */
   open_quote = _("`");

diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 2353c9c..90b1994 100644 (file)
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 PACKAGE = @PACKAGE@
+PACKAGE_SUFFIX = -4.7
 RANLIB = @RANLIB@
 SHELL = @SHELL@
 USED_CATALOGS = @USED_CATALOGS@
@@ -73,8 +74,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
        -I$(srcdir)/include
 
 ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
+ALL_CFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\"
 ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \
        $(CPPFLAGS)
+ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\"
 
 # The name of the compiler to use.
 COMPILER = $(CXX)
@@ -163,8 +166,8 @@ install-strip install: all installdirs
          else continue; \
          fi; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
-         echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
-         $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+         echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \
+         $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \
        done
 
 mostlyclean:

diff --git a/libcpp/init.c b/libcpp/init.c
index 3037ecd..5bc1213 100644 (file)
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -144,7 +144,7 @@ init_library (void)
       init_trigraph_map ();
 
 #ifdef ENABLE_NLS
-       (void) bindtextdomain (PACKAGE, LOCALEDIR);
+       (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);
 #endif
     }
 }

diff --git a/libcpp/system.h b/libcpp/system.h
index 4e3dff8..c37542b 100644 (file)
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -280,7 +280,7 @@ extern int errno;
 #endif
 
 #ifndef _
-# define _(msgid) dgettext (PACKAGE, msgid)
+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)
 #endif
 
 #ifndef N_