diff options
| -rw-r--r-- | e-util/ChangeLog | 5 | ||||
| -rw-r--r-- | e-util/Makefile.am | 2 | ||||
| -rw-r--r-- | e-util/e-util-private.h | 4 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index bf0934b36e..b2d6b8fe55 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. - (GAL_IMAGESDIR): Remove, unused leftover. - (EVOLUTION_GLADEDIR): Add. + (INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add + EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR. Remove undefined + GNOME_INCLUDEDIR. (libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED. (libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary libs. diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 7cc3ee1f26..7c3bd69921 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_builddir) \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ @@ -21,7 +22,6 @@ INCLUDES = \ $(GNOME_PILOT_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ $(GNOME_FULL_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ $(ICONV_CFLAGS) \ $(E_UTIL_CFLAGS) diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index 5e160fb657..5ecc62191b 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -30,6 +30,7 @@ const char *_e_get_localedir (void) G_GNUC_CONST; const char *_e_get_gladedir (void) G_GNUC_CONST; +const char *_e_get_helpdir (void) G_GNUC_CONST; const char *_e_get_images (void) G_GNUC_CONST; const char *_e_get_iconsdir (void) G_GNUC_CONST; const char *_e_get_category_icons (void) G_GNUC_CONST; @@ -42,6 +43,9 @@ const char *_e_get_privdatadir (void) G_GNUC_CONST; #undef EVOLUTION_GLADEDIR #define EVOLUTION_GLADEDIR _e_get_gladedir () +#undef EVOLUTION_HELPDIR +#define EVOLUTION_HELPDIR _e_get_helpdir () + #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 2fd9496cfd..00759783cf 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -36,6 +36,7 @@ static const char *localedir = NULL; /* The others are in UTF-8 */ static const char *gladedir; +static const char *helpdir; static const char *images; static const char *iconsdir; static const char *category_icons; @@ -96,6 +97,7 @@ setup (void) g_free (cp_prefix); gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); + helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR); images = replace_prefix (full_prefix, EVOLUTION_IMAGES); category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS); plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR); @@ -117,6 +119,7 @@ _e_get_##varbl (void) \ GETTER(localedir) GETTER(gladedir) +GETTER(helpdir) GETTER(images) GETTER(iconsdir) GETTER(category_icons) |