# DP: Set gettext's domain and textdomain to the versioned package name.

--- a/src/gcc/intl.c

+++ b/src/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-10", LOCALEDIR);

+  (void) textdomain ("gcc-10");

   /* Opening quotation mark.  */

   open_quote = _("`");

--- a/src/gcc/Makefile.in

+++ b/src/gcc/Makefile.in

@@ -4276,8 +4276,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-10.mo; \

+	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-10.mo; \

 	done

 # Rule for regenerating the message template (gcc.pot).

--- a/src/libcpp/init.c

+++ b/src/libcpp/init.c

@@ -167,7 +167,7 @@ init_library (void)

       init_trigraph_map ();

 #ifdef ENABLE_NLS

-       (void) bindtextdomain (PACKAGE, LOCALEDIR);

+       (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);

 #endif

     }

 }

--- a/src/libcpp/system.h

+++ b/src/libcpp/system.h

@@ -284,7 +284,7 @@ extern int errno;

 #endif

 #ifndef _

-# define _(msgid) dgettext (PACKAGE, msgid)

+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)

 #endif

 #ifndef N_

--- a/src/libcpp/Makefile.in

+++ b/src/libcpp/Makefile.in

@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@

 LIBICONV = @LIBICONV@

 LIBINTL = @LIBINTL@

 PACKAGE = @PACKAGE@

+PACKAGE_SUFFIX = -10

 RANLIB = @RANLIB@

 SHELL = @SHELL@

 USED_CATALOGS = @USED_CATALOGS@

@@ -72,10 +73,12 @@ depcomp = $(SHELL) $(srcdir)/../depcomp

 INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \

 	-I$(srcdir)/include

+DEBCPPFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\"

-ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)

+ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG) \

+	$(DEBCPPFLAGS)

 ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \

-	$(CPPFLAGS) $(PICFLAG)

+	$(CPPFLAGS) $(PICFLAG) $(DEBCPPFLAGS)

 # The name of the compiler to use.

 COMPILER = $(CXX)

@@ -164,8 +167,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: