[PATCH] bugzilla 83666

[HideToshi Tajima <hidetoshi tajima sun com>]

Hi,

Please find a patch below for "bindtextdomain with wrong domain names":

http://bugzilla.gnome.org/show_bug.cgi?id=83636

The patch's been made by following the way glib, libgnome, and libgnome do.

Please review and commit if okay.

Regards,
Toshi

? nautilus/help/nautilus-user-manual/C/nautilus-user-manual-C.omf.out
Index: nautilus/configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.452
diff -u -r1.452 configure.in
--- nautilus/configure.in	2002/05/27 17:20:43	1.452
+++ nautilus/configure.in	2002/05/31 16:29:34
@@ -72,6 +72,11 @@
 
 AM_GLIB_GNU_GETTEXT
 
+# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+nautiluslocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(nautiluslocaledir)
+
 AC_PROG_INTLTOOL
 
 dnl ==========================================================================
Index: nautilus/libbackground/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/libbackground/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- nautilus/libbackground/Makefile.am	2002/03/10 00:37:09	1.4
+++ nautilus/libbackground/Makefile.am	2002/05/31 16:29:34
@@ -1,7 +1,7 @@
 EXTRA_DIST = ChangeLog
 
 INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
+	-DGNOMELOCALEDIR=\""$(nautiluslocaledir)"\" \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
 	-I$(top_srcdir)/						\
Index: nautilus/src/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/src/Makefile.am,v
retrieving revision 1.137
diff -u -r1.137 Makefile.am
--- nautilus/src/Makefile.am	2002/03/09 02:45:07	1.137
+++ nautilus/src/Makefile.am	2002/05/31 16:29:34
@@ -10,7 +10,7 @@
 	-I$(top_builddir)/libnautilus-private \
 	$(CORE_CFLAGS) \
 	-DDATADIR=\""$(datadir)"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(nautiluslocaledir)"\" \
 	-DLIBDIR=\""$(libdir)"\" \
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
 	-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" \
Index: nautilus/test/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/test/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- nautilus/test/Makefile.am	2002/02/27 18:05:45	1.45
+++ nautilus/test/Makefile.am	2002/05/31 16:29:34
@@ -4,7 +4,7 @@
 	-I$(top_srcdir) \
 	$(CORE_CFLAGS) \
 	-DVERSION="\"$(VERSION)\"" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(nautiluslocaledir)"\" \
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
 	$(NULL)
 
Index: nautilus-gtkhtml/configure.in
===================================================================
RCS file: /cvs/gnome/nautilus-gtkhtml/configure.in,v
retrieving revision 1.25
diff -u -r1.25 configure.in
--- nautilus-gtkhtml/configure.in	2002/05/13 23:15:53	1.25
+++ nautilus-gtkhtml/configure.in	2002/05/31 16:29:34
@@ -24,6 +24,11 @@
 
 AM_GLIB_GNU_GETTEXT
 
+# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+nautiluslocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(nautiluslocaledir)
+
 AC_PROG_INTLTOOL
 
 AC_OUTPUT([
Index: nautilus-gtkhtml/src/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus-gtkhtml/src/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- nautilus-gtkhtml/src/Makefile.am	2002/03/13 15:25:07	1.6
+++ nautilus-gtkhtml/src/Makefile.am	2002/05/31 16:29:34
@@ -2,7 +2,7 @@
 	-DG_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(nautiluslocaledir)"\" \
 	-DG_LOG_DOMAIN=\"Nautilus-GtkHTML\"	\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \