diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-10 19:17:16 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-10 19:18:12 +0800 |
| commit | a674eab94dd55978a6fa8db1fbe57bf419377f43 (patch) | |
| tree | a59c00218fc0a278c223b10594671fc72a761f41 /e-util | |
| parent | 92e1807bd758995edc6600856c3fb0a4ee546fdf (diff) | |
| download | gsoc2013-evolution-a674eab94dd55978a6fa8db1fbe57bf419377f43.tar.gz gsoc2013-evolution-a674eab94dd55978a6fa8db1fbe57bf419377f43.tar.zst gsoc2013-evolution-a674eab94dd55978a6fa8db1fbe57bf419377f43.zip | |
Update win32 directory relocation and some consistency cleanup
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/Makefile.am | 5 | ||||
| -rw-r--r-- | e-util/e-util-private.h | 13 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 9 |
3 files changed, 16 insertions, 11 deletions
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) |