diff options
| -rw-r--r-- | e-util/ChangeLog | 5 | ||||
| -rw-r--r-- | e-util/Makefile.am | 1 | ||||
| -rw-r--r-- | e-util/e-util-private.h | 3 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index b2d6b8fe55..30244d3f8e 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -4,8 +4,9 @@ libemisdwidgets. Code here uses e_utf8_to_locale_string() from libemiscwidgets which hasn't been built yet if building from scratch. - (INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add - EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR. Remove undefined + (INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add the + definitions of EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR, + EVOLUTION_ETSPECDIR (for e-win32-reloc.c). Remove undefined GNOME_INCLUDEDIR. (libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED. (libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 7c3bd69921..fe9618ca22 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index 5ecc62191b..c4f7b90e18 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -46,6 +46,9 @@ const char *_e_get_privdatadir (void) G_GNUC_CONST; #undef EVOLUTION_HELPDIR #define EVOLUTION_HELPDIR _e_get_helpdir () +#undef EVOLUTION_ETSPECDIR +#define EVOLUTION_ETSPECDIR _e_get_etspecdir () + #undef EVOLUTION_IMAGES #define EVOLUTION_IMAGES _e_get_images () diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 00759783cf..c85d695fa6 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -37,6 +37,7 @@ static const char *localedir = NULL; /* The others are in UTF-8 */ static const char *gladedir; static const char *helpdir; +static const char *etspecdir; static const char *images; static const char *iconsdir; static const char *category_icons; @@ -98,6 +99,7 @@ setup (void) gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR); + etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR); images = replace_prefix (full_prefix, EVOLUTION_IMAGES); category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS); plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR); @@ -120,6 +122,7 @@ _e_get_##varbl (void) \ GETTER(localedir) GETTER(gladedir) GETTER(helpdir) +GETTER(etspecdir) GETTER(images) GETTER(iconsdir) GETTER(category_icons) |