[evolution/gnome-2-30] Relocating EVOLUTION_BINDIR which will be used in plugin setting Evolution comme defaut mail applica

[Fridrich Strba <strba src gnome org>]

commit a9b0e550c9e01f423ab45ceb3559e26c7ad98bdb
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Fri Apr 23 14:20:47 2010 +0200

    Relocating EVOLUTION_BINDIR which will be used in plugin
    setting Evolution comme defaut mail application on windows.

 e-util/Makefile.am      |    1 +
 e-util/e-util-private.h |    4 ++++
 e-util/e-win32-reloc.c  |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 99f873c..b22fd3a 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -64,6 +64,7 @@ libeutil_la_CPPFLAGS =							\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)/widgets						\
+	-DEVOLUTION_BINDIR=\""$(bindir)"\"				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 4503f45..74d01b3 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -35,6 +35,7 @@
 
 #define fsync(fd) 0
 
+const gchar *_e_get_bindir (void) G_GNUC_CONST;
 const gchar *_e_get_datadir (void) G_GNUC_CONST;
 const gchar *_e_get_ecpsdir (void) G_GNUC_CONST;
 const gchar *_e_get_etspecdir (void) G_GNUC_CONST;
@@ -67,6 +68,9 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST;
 #undef PREFIX
 #define PREFIX _e_get_prefix ()
 
+#undef EVOLUTION_BINDIR
+#define EVOLUTION_BINDIR _e_get_bindir ()
+
 #undef EVOLUTION_DATADIR
 #define EVOLUTION_DATADIR _e_get_datadir ()
 
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index f99a5f5..bfe903b 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -34,6 +34,7 @@
 static const gchar *localedir = NULL;
 
 /* The others are in UTF-8 */
+static const gchar *bindir;
 static const gchar *datadir;
 static const gchar *ecpsdir;
 static const gchar *etspecdir;
@@ -114,6 +115,7 @@ setup (void)
 	/* It makes sense to have some of the paths overridable with
 	 * environment variables.
 	 */
+	bindir = replace_prefix (full_prefix, EVOLUTION_BINDIR);
 	datadir = replace_prefix (full_prefix, EVOLUTION_DATADIR);
 	ecpsdir = replace_prefix (full_prefix, EVOLUTION_ECPSDIR);
 	etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR);
@@ -155,6 +157,7 @@ _e_get_##varbl (void)				\
         return varbl;				\
 }
 
+GETTER(bindir)
 GETTER(datadir)
 GETTER(ecpsdir)
 GETTER(etspecdir)