AM_GNOME_GETTEXT doesn't use $(datadir)/locale as the locale dir. (It

uses either $(prefix)/share/locale or $(prefix)/lib/locale.) Cope with
this.

svn path=/trunk/; revision=6141

24 files changed, 62 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index f41da6a6ee..68b7f6e5cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
+
+	* configure.in: set localedir here to use in Makefiles.
+	(AM_GNOME_GETTEXT doesn't actually always set it to
+	$(datadir)/locale).
+
 2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
 
 	* configure.in: Updated the gal check to check for gal 0.2.1.
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 5d5aeff406..903525eaa9 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* gui/component/select-names/Makefile.am (INCLUDES): 
+	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
+
+	* backend/pas/Makefile.am (INCLUDES): 
+	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
+
 2000-10-23  JP Rosevear  <jpr@helixcode.com>
 
 	* conduit/address-conduit.h: Use new libeconduit calls and
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 7f4a4c59fe..7fef103315 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -17,7 +17,7 @@ $(CORBA_SOURCE): $(idls)
 	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
 
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+        -DGNOMELOCALEDIR=\""$(localedir)"\"        \
 	-DG_LOG_DOMAIN=\"EBook\"			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/addressbook/backend		\
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 8f4f8a3731..f0a5f79e11 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -13,7 +13,7 @@ $(CORBA_SOURCE): $(idls)
 	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
 
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
 	-DG_LOG_DOMAIN=\"wombat-pas\"			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/addressbook/backend		\
@@ -49,4 +49,4 @@ libpas_a_SOURCES =					\
 BUILT_SOURCES = $(CORBA_SOURCE)
 CLEANFILES   += $(BUILT_SOURCES)
 
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
\ No newline at end of file
+EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 8813504989..ca8e333739 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES =						\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 
 bin_PROGRAMS =	\
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index ef8d0bf14f..614194fb68 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -39,7 +39,7 @@ INCLUDES =						\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 
 lib_LTLIBRARIES = libeselectnames.la
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9e8438f2da..03b6968ac8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* pcs/Makefile.am (INCLUDES): 
+	* gui/dialogs/Makefile.am (INCLUDES): 
+	* gui/Makefile.am (INCLUDES): 
+	* cal-util/Makefile.am (INCLUDES): 
+	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
+
 2000-10-23  JP Rosevear  <jpr@helixcode.com>
 
 	* conduits/todo/todo-conduit.h: Use new libeconduit calls and
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index ce968767f5..56757e3946 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -17,7 +17,7 @@ $(CORBA_GENERATED): $(idls)
 	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
 
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
 	-DG_LOG_DOMAIN=\"cal-client\"			\
 	-I$(top_srcdir)/calendar			\
 	-I$(srcdir) -I$(top_srcdir) 			\
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index cedbd84d25..9a1b677e9b 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = test-recur
 
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
 	-DG_LOG_DOMAIN=\"cal-util\"			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/calendar			\
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index d886346abb..5376cbc1a6 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = 						\
 	$(EXTRA_GNOME_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+        -DGNOMELOCALEDIR=\""$(localedir)"\"
 
 LINK_FLAGS =							\
 	$(BONOBO_VFS_GNOME_LIBS)				\
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 98c8be9f97..9b80e03f95 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = 						\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+        -DGNOMELOCALEDIR=\""$(localedir)"\"
 
 noinst_LIBRARIES = libcal-dialogs.a
 
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index b435b90229..5ca12eff6e 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/libical/src/libical		\
 	-I$(top_builddir)/libical/src/libical		\
 	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+        -DGNOMELOCALEDIR=\""$(localedir)"\"
 
 CORBA_GENERATED =				\
 	evolution-calendar.h			\
diff --git a/configure.in b/configure.in
index 1658b91c62..46054336de 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,8 @@ LIBS=$LIBS_save
 ALL_LINGUAS="da de el en_GB es fi fr ga gl hu it ja ko nl nn no pl pt ru sl sv tr uk"
 
 AM_GNOME_GETTEXT
+localedir='$(prefix)/$(DATADIRNAME)/locale'
+AC_SUBST(localedir)
 
 GNOME_X_CHECKS
 
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index ddc7fc9e09..e9878fa0aa 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* idl/Makefile.am (INCLUDES): 
+	* evolution-services/Makefile.am (INCLUDES): 
+	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
+
 2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* evolution-executive-summary.oafinfo: Added
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index bf86e72d2c..334069a76b 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
 	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
 
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
index 50ad203294..693fb65905 100644
--- a/executive-summary/evolution-services/Makefile.am
+++ b/executive-summary/evolution-services/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DG_LOG_DOMAIN=\"evolution-services\"
 
diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am
index 84cca5934d..e45784d49c 100644
--- a/executive-summary/idl/Makefile.am
+++ b/executive-summary/idl/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3dfad4a451..dd6f72ac58 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR.
+
 2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-ops.c (do_send_mail): Apply outgoing filters to the
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0a3b3cfc0d..b0680a10e3 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = \
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\
 	-DG_LOG_DOMAIN=\"evolution-mail\"		\
diff --git a/notes/Makefile.am b/notes/Makefile.am
index 79ebc82a88..c57e4202c2 100644
--- a/notes/Makefile.am
+++ b/notes/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DG_LOG_DOMAIN=\"evolution-notes\"
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1006b40bc1..af478332b5 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
+
 2000-10-20  Michael Meeks  <michael@helixcode.com>
 
 	* evolution-shell-component-client.c
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d8ef0ec80e..97205112ff 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = 								\
 	$(EXTRA_GNOME_CFLAGS)						\
 	-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"		\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"				\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            		\
 	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"		\
 	-DG_LOG_DOMAIN=\"evolution-shell\"
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index f77de0f9a6..124fb81aea 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-23  Dan Winship  <danw@helixcode.com>
+
+	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
+
 2000-09-25  Federico Mena Quintero  <federico@helixcode.com>
 
 	* Makefile.am (INCLUDES): Add the libical include path.
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 44ebff9345..89ea9f2d69 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -8,9 +8,9 @@ INCLUDES =						\
 	-I$(top_srcdir)/calendar/pcs			\
 	-I$(top_srcdir)/libical/src/libical		\
 	$(GNOME_INCLUDEDIR)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)				\
+	$(BONOBO_VFS_GNOME_CFLAGS)			\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
 
 bin_PROGRAMS =	\
 	wombat