s/EVOLUTION_LOCALEDIR/LOCALEDIR/

diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index fe58e29..0827043 100644 (file)
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libebook-1.2.la
 
 libebook_1_2_la_CPPFLAGS = \
        $(AM_CPPFLAGS)                                  \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"        \
+       -DLOCALEDIR=\""$(localedir)"\"                  \
        -DG_LOG_DOMAIN=\"libebook\"                     \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \

diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 2a91493..faeccbb 100644 (file)
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -35,8 +35,8 @@
 
 #ifdef G_OS_WIN32
 #include "libedataserver/e-data-server-util.h"
-#undef EVOLUTION_LOCALEDIR
-#define EVOLUTION_LOCALEDIR e_util_get_localedir ()
+#undef LOCALEDIR
+#define LOCALEDIR e_util_get_localedir ()
 #endif
 
 #define d(x)
@@ -1315,7 +1315,7 @@ e_contact_pretty_name (EContactField field_id)
        g_return_val_if_fail (field_id >= 1 && field_id <= E_CONTACT_FIELD_LAST, "");
 
 #ifdef ENABLE_NLS
-       bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
 

diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index e76324d..694c4af 100644 (file)
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -104,7 +104,7 @@ e_calendar_factory_CPPFLAGS = \
        $(AM_CPPFLAGS)                                  \
        -DG_LOG_DOMAIN=\"libedata-cal\"                 \
        -DE_PRGNAME=\"e-calendar-factory\"              \
-       -DEVOLUTION_LOCALEDIR=\"$(localedir)\"          \
+       -DLOCALEDIR=\"$(localedir)\"                    \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        -I$(top_srcdir)/calendar                        \

diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index d22e41b..a26d84f 100644 (file)
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -708,7 +708,7 @@ main (gint argc, gchar **argv)
        EOfflineListener *eol;
 
        setlocale (LC_ALL, "");
-       bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
        g_type_init ();

diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am
index eeae03a..a7f142f 100644 (file)
--- a/calendar/tests/ecal/Makefile.am
+++ b/calendar/tests/ecal/Makefile.am
@@ -3,7 +3,7 @@ libecal_test_utils_la_SOURCES = ecal-test-utils.c ecal-test-utils.h
 
 libecal_test_utils_la_CPPFLAGS = \
        $(AM_CPPFLAGS)                                  \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"        \
+       -DLOCALEDIR=\""$(localedir)"\"                  \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        -I$(top_srcdir)/calendar                        \

diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c
index de537da..b7ce7ed 100644 (file)
--- a/calendar/tests/ecal/test-ecal.c
+++ b/calendar/tests/ecal/test-ecal.c
@@ -712,7 +712,7 @@ gint
 main (gint argc, gchar **argv)
 {
        gchar *uri;
-       bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        textdomain (GETTEXT_PACKAGE);
 
        g_type_init ();

diff --git a/camel/Makefile.am b/camel/Makefile.am
index d1b20f9..453a7cd 100644 (file)
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -41,7 +41,7 @@ libcamel_provider_1_2_la_CPPFLAGS = \
        -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"          \
        -DG_LOG_DOMAIN=\"camel\"                                \
        -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                    \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                \
+       -DLOCALEDIR=\""$(localedir)"\"                          \
        -DCAMEL_COMPILATION                                     \
        $(CAMEL_CFLAGS)                                         \
        $(DBUS_GLIB_CFLAGS)
@@ -156,7 +156,7 @@ libcamel_1_2_la_CPPFLAGS = \
        -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"          \
        -DG_LOG_DOMAIN=\"camel\"                                \
        -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                    \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                \
+       -DLOCALEDIR=\""$(localedir)"\"                          \
        -DCAMEL_COMPILATION                                     \
        $(CAMEL_CFLAGS)
 
@@ -324,7 +324,7 @@ camel_lock_helper_1_2_CPPFLAGS = \
        -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"          \
        -DG_LOG_DOMAIN=\"camel\"                                \
        -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                    \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                \
+       -DLOCALEDIR=\""$(localedir)"\"                          \
        -DCAMEL_COMPILATION                                     \
        $(CAMEL_CFLAGS)
 
@@ -348,7 +348,7 @@ camel_index_control_1_2_CPPFLAGS = \
        -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"          \
        -DG_LOG_DOMAIN=\"camel\"                                \
        -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                    \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                \
+       -DLOCALEDIR=\""$(localedir)"\"                          \
        -DCAMEL_COMPILATION                                     \
        $(CAMEL_CFLAGS)
 

diff --git a/camel/camel-win32.c b/camel/camel-win32.c
index d284096..1324005 100644 (file)
--- a/camel/camel-win32.c
+++ b/camel/camel-win32.c
@@ -54,7 +54,7 @@ setup (void)
                 return;
         }
 
-        localedir = e_util_replace_prefix (E_DATA_SERVER_PREFIX, e_util_get_cp_prefix (), EVOLUTION_LOCALEDIR);
+        localedir = e_util_replace_prefix (E_DATA_SERVER_PREFIX, e_util_get_cp_prefix (), LOCALEDIR);
 
        libexecdir = e_util_replace_prefix (E_DATA_SERVER_PREFIX, e_util_get_prefix (), CAMEL_LIBEXECDIR);
        providerdir = e_util_replace_prefix (E_DATA_SERVER_PREFIX, e_util_get_prefix (), CAMEL_PROVIDERDIR);

diff --git a/camel/camel-win32.h b/camel/camel-win32.h
index fac1fdd..4ff1b0f 100644 (file)
--- a/camel/camel-win32.h
+++ b/camel/camel-win32.h
@@ -42,8 +42,8 @@ const gchar *_camel_get_localedir (void) G_GNUC_CONST;
 const gchar *_camel_get_libexecdir (void) G_GNUC_CONST;
 const gchar *_camel_get_providerdir (void) G_GNUC_CONST;
 
-#undef EVOLUTION_LOCALEDIR
-#define EVOLUTION_LOCALEDIR _camel_get_localedir ()
+#undef LOCALEDIR
+#define LOCALEDIR _camel_get_localedir ()
 
 #undef CAMEL_LIBEXECDIR
 #define CAMEL_LIBEXECDIR _camel_get_libexecdir ()

diff --git a/camel/camel.c b/camel/camel.c
index a54064b..9fb07ae 100644 (file)
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -91,7 +91,7 @@ camel_init (const gchar *configdir, gboolean nss_init)
        if (initialised)
                return 0;
 
-       bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
        camel_debug_init();

diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 74b04f5..556603d 100644 (file)
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -6,7 +6,7 @@ libedataserver_1_2_la_CPPFLAGS = \
        -I$(top_srcdir)                                                 \
        -DG_LOG_DOMAIN=\"e-data-server\"                                \
        -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                            \
-       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                        \
+       -DE_DATA_SERVER_LOCALEDIR=\""$(localedir)"\"                    \
        -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"                \
        -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"                      \
        -DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"                 \

diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 5104f91..48cda11 100644 (file)
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -610,7 +610,7 @@ setup (void)
        g_free (full_pfx);
        g_free (cp_pfx);
 
-       localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR);
+       localedir = replace_prefix (cp_prefix, E_DATA_SERVER_LOCALEDIR);
        extensiondir = replace_prefix (prefix, E_DATA_SERVER_EXTENSIONDIR);
        imagesdir = replace_prefix (prefix, E_DATA_SERVER_IMAGESDIR);
        ui_uidir = replace_prefix (prefix, E_DATA_SERVER_UI_UIDIR);