aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-23 20:20:47 +0800
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-23 20:20:47 +0800
commit1a5e1620d3d28c2bf74d55cd02d258620c61d6b5 (patch)
treeaf3d15b3f2b4eddbf447de965454264de6caa038
parent06b16e2055ee657bc62fef96029cecb4c8483521 (diff)
downloadgsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar.gz
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar.bz2
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar.lz
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar.xz
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.tar.zst
gsoc2013-evolution-1a5e1620d3d28c2bf74d55cd02d258620c61d6b5.zip
Relocating EVOLUTION_BINDIR which will be used in plugin
setting Evolution comme defaut mail application on windows.
-rw-r--r--e-util/Makefile.am1
-rw-r--r--e-util/e-util-private.h4
-rw-r--r--e-util/e-win32-reloc.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 4f85b3bfd0..e6e3637a43 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -63,6 +63,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 4503f4585e..74d01b31a3 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 f99a5f582b..bfe903bbc4 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)