aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/gui/widgets/Makefile.am2
-rw-r--r--addressbook/printing/Makefile.am1
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--e-util/Makefile.am5
-rw-r--r--e-util/e-util-private.h13
-rw-r--r--e-util/e-win32-reloc.c9
-rw-r--r--mail/Makefile.am2
-rw-r--r--widgets/misc/Makefile.am5
-rw-r--r--widgets/misc/e-map.c2
9 files changed, 22 insertions, 19 deletions
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index ffe064a349..511876ad0f 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -8,7 +8,7 @@ libeabwidgets_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"eab-widgets\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
- -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/filter \
-I$(top_srcdir)/widgets \
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 04b72bfa4a..c315b49d0a 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -33,7 +33,6 @@ contact_print_test_CPPFLAGS = \
-DG_LOG_DOMAIN=\"addressbook-printing\" \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir) \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
$(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b175dc84a2..ba6d56dc87 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -66,7 +66,7 @@ libevolution_calendar_la_CPPFLAGS = \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/misc \
- -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index b34e0375a8..90da30ee46 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -72,6 +72,7 @@ libeutil_la_CPPFLAGS = \
-DEVOLUTION_LIBDIR=\""$(datadir)"\" \
-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \
-DEVOLUTION_PREFIX=\""$(prefix)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
@@ -79,7 +80,7 @@ libeutil_la_CPPFLAGS = \
-DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \
-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
- -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PLATFORM_CFLAGS) \
$(GNOME_PILOT_CFLAGS) \
@@ -184,7 +185,7 @@ libeconduit_la_CPPFLAGS = \
-DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \
-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
- -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PILOT_CFLAGS) \
$(E_UTIL_CFLAGS)
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 775895eba7..46d49428d1 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -47,10 +47,11 @@ const gchar *_e_get_imagesdir (void) G_GNUC_CONST;
const gchar *_e_get_libdir (void) G_GNUC_CONST;
const gchar *_e_get_libexecdir (void) G_GNUC_CONST;
const gchar *_e_get_localedir (void) G_GNUC_CONST;
+const gchar *_e_get_moduledir (void) G_GNUC_CONST;
const gchar *_e_get_plugindir (void) G_GNUC_CONST;
const gchar *_e_get_prefix (void) G_GNUC_CONST;
const gchar *_e_get_privdatadir (void) G_GNUC_CONST;
-const gchar *_e_get_search_rule_dir (void) G_GNUC_CONST;
+const gchar *_e_get_ruledir (void) G_GNUC_CONST;
const gchar *_e_get_sounddir (void) G_GNUC_CONST;
const gchar *_e_get_sysconfdir (void) G_GNUC_CONST;
const gchar *_e_get_toolsdir (void) G_GNUC_CONST;
@@ -95,15 +96,15 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST;
#undef EVOLUTION_ICONSDIR
#define EVOLUTION_ICONSDIR _e_get_iconsdir ()
-#undef EVOLUTION_IMAGES
-#define EVOLUTION_IMAGES EVOLUTION_IMAGESDIR
-
#undef EVOLUTION_IMAGESDIR
#define EVOLUTION_IMAGESDIR _e_get_imagesdir ()
#undef EVOLUTION_LIBEXECDIR
#define EVOLUTION_LIBEXECDIR _e_get_libexecdir ()
+#undef EVOLUTION_MODULEDIR
+#define EVOLUTION_MODULEDIR _e_get_moduledir ()
+
#undef EVOLUTION_PLUGINDIR
#define EVOLUTION_PLUGINDIR _e_get_plugindir ()
@@ -122,8 +123,8 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST;
#undef EVOLUTION_UIDIR
#define EVOLUTION_UIDIR _e_get_uidir ()
-#undef SEARCH_RULE_DIR
-#define SEARCH_RULE_DIR _e_get_search_rule_dir ()
+#undef EVOLUTION_RULEDIR
+#define EVOLUTION_RULEDIR _e_get_ruledir ()
#endif /* G_OS_WIN32 */
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 2f31d647ac..d01c4c820e 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -45,10 +45,11 @@ static const gchar *iconsdir;
static const gchar *imagesdir;
static const gchar *libdir;
static const gchar *libexecdir;
+static const gchar *moduledir;
static const gchar *plugindir;
static const gchar *prefix;
static const gchar *privdatadir;
-static const gchar *search_rule_dir;
+static const gchar *ruledir;
static const gchar *sounddir;
static const gchar *sysconfdir;
static const gchar *toolsdir;
@@ -134,9 +135,10 @@ setup (void)
imagesdir = replace_prefix (full_prefix, EVOLUTION_IMAGESDIR);
libdir = replace_prefix (full_prefix, EVOLUTION_LIBDIR);
libexecdir = replace_prefix (full_prefix, EVOLUTION_LIBEXECDIR);
+ moduledir = replace_prefix (full_prefix, EVOLUTION_MODULEDIR);
plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR);
privdatadir = replace_prefix (full_prefix, EVOLUTION_PRIVDATADIR);
- search_rule_dir = replace_prefix (full_prefix, SEARCH_RULE_DIR);
+ ruledir = replace_prefix (full_prefix, EVOLUTION_RULEDIR);
sounddir = replace_prefix (full_prefix, EVOLUTION_SOUNDDIR);
sysconfdir = replace_prefix (full_prefix, EVOLUTION_SYSCONFDIR);
toolsdir = replace_prefix (full_prefix, EVOLUTION_TOOLSDIR);
@@ -169,10 +171,11 @@ GETTER(imagesdir)
GETTER(libdir)
GETTER(libexecdir)
GETTER(localedir)
+GETTER(moduledir)
GETTER(plugindir)
GETTER(prefix)
GETTER(privdatadir)
-GETTER(search_rule_dir)
+GETTER(ruledir)
GETTER(sounddir)
GETTER(sysconfdir)
GETTER(toolsdir)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c31b4cd406..aa8f5fa350 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -25,7 +25,7 @@ libevolution_mail_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index eec4edf54b..daaf9717f2 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -83,7 +83,7 @@ libemiscwidgets_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/filter \
-I$(top_srcdir)/widgets \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
$(EVOLUTION_MAIL_CFLAGS) \
@@ -175,8 +175,7 @@ test_widgets_misc_CPPFLAGS= \
-I$(top_srcdir) \
-I$(top_srcdir)/filter \
-I$(top_srcdir)/widgets \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
$(EVOLUTION_MAIL_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS)
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index f59e33d5cd..ff13e41be8 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -198,7 +198,7 @@ static void
e_map_init (EMap *view)
{
EMapPrivate *priv;
- gchar *map_file_name = g_build_filename (EVOLUTION_IMAGES, "world_map-960.png", NULL);
+ gchar *map_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "world_map-960.png", NULL);
priv = g_new0 (EMapPrivate, 1);
view->priv = priv;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 14:19:55 +0800