1
# DP: Set gettext's domain and textdomain to the versioned package name.
3
Index: b/src/gcc/intl.c
4
===================================================================
7
@@ -55,8 +55,8 @@ gcc_init_libintl (void)
8
setlocale (LC_ALL, "");
11
- (void) bindtextdomain ("gcc", LOCALEDIR);
12
- (void) textdomain ("gcc");
13
+ (void) bindtextdomain ("gcc-4.8", LOCALEDIR);
14
+ (void) textdomain ("gcc-4.8");
16
/* Opening quotation mark. */
18
Index: b/src/gcc/Makefile.in
19
===================================================================
20
--- a/src/gcc/Makefile.in
21
+++ b/src/gcc/Makefile.in
22
@@ -5261,8 +5261,8 @@ install-po:
23
dir=$(localedir)/$$lang/LC_MESSAGES; \
24
echo $(mkinstalldirs) $(DESTDIR)$$dir; \
25
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
26
- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
27
- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
28
+ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.8.mo; \
29
+ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.8.mo; \
32
# Rule for regenerating the message template (gcc.pot).
33
Index: b/src/libcpp/init.c
34
===================================================================
35
--- a/src/libcpp/init.c
36
+++ b/src/libcpp/init.c
37
@@ -144,7 +144,7 @@ init_library (void)
41
- (void) bindtextdomain (PACKAGE, LOCALEDIR);
42
+ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);
46
Index: b/src/libcpp/system.h
47
===================================================================
48
--- a/src/libcpp/system.h
49
+++ b/src/libcpp/system.h
50
@@ -280,7 +280,7 @@ extern int errno;
54
-# define _(msgid) dgettext (PACKAGE, msgid)
55
+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)
59
Index: b/src/libcpp/Makefile.in
60
===================================================================
61
--- a/src/libcpp/Makefile.in
62
+++ b/src/libcpp/Makefile.in
63
@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@
67
+PACKAGE_SUFFIX = -4.8
70
USED_CATALOGS = @USED_CATALOGS@
71
@@ -71,10 +72,11 @@ depcomp = $(SHELL) $(srcdir)/../depcomp
73
INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
75
+DEBCPPFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\"
77
-ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
78
+ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(DEBCPPFLAGS)
79
ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \
81
+ $(CPPFLAGS) $(DEBCPPFLAGS)
83
# The name of the compiler to use.
85
@@ -163,8 +165,8 @@ install-strip install: all installdirs
88
dir=$(localedir)/$$lang/LC_MESSAGES; \
89
- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
90
- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
91
+ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \
92
+ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \