aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog11
-rw-r--r--e-util/Makefile.am3
-rw-r--r--e-util/e-util-private.h19
-rw-r--r--e-util/e-win32-reloc.c12
4 files changed, 41 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index c0ee1fac27..ea7d421dab 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -2,13 +2,16 @@
* Makefile.am: Use privsolib instead of privlib. On Unix they are
the same, on Win32 privsolibdir is the same as libdir.
- (INCLUDES): Pass also EVOLUTION_LIBEXECDIR and EVOLUTION_SOUNDDIR
- so that the Win32 run-time path lookup code in e-win32-reloc.c can
+ (INCLUDES): Pass also EVOLUTION_SYSCONFDIR, EVOLUTION_DATADIR,
+ EVOLUTION_LIBDIR, EVOLUTION_LIBEXECDIR and EVOLUTION_SOUNDDIR so
+ that the Win32 run-time path lookup code in e-win32-reloc.c can
handle them, too.
- * e-win32-reloc.c: Handle also the above two paths.
+ * e-win32-reloc.c: Handle also the above, and the bare PREFIX.
- * e-util-private.h: Ditto here. Also EVOLUTION_ETSPECDIR.
+ * e-util-private.h: Ditto here. (PREFIX, SYSCONFDIR, DATADIR and
+ LIBDIR without the EVOLUTION_ prefix, as that is how they are to
+ be used, cf. gnome-program.h.) Also EVOLUTION_ETSPECDIR.
2005-07-11 Vivek Jain <jvivek@novell.com>
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f1bc029e7e..1527521627 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -11,6 +11,9 @@ INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/widgets \
-DEVOLUTION_PREFIX=\""$(prefix)"\" \
+ -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_LIBDIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 16447a1117..5f68341d4a 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -29,6 +29,10 @@
#ifdef G_OS_WIN32
const char *_e_get_localedir (void) G_GNUC_CONST;
+const char *_e_get_prefix (void) G_GNUC_CONST;
+const char *_e_get_sysconfdir (void) G_GNUC_CONST;
+const char *_e_get_datadir (void) G_GNUC_CONST;
+const char *_e_get_libdir (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_etspecdir (void) G_GNUC_CONST;
@@ -45,6 +49,21 @@ const char *_e_get_sounddir (void) G_GNUC_CONST;
#undef EVOLUTION_LOCALEDIR
#define EVOLUTION_LOCALEDIR _e_get_localedir ()
+#undef PREFIX
+#define PREFIX _e_get_prefix ()
+
+#undef SYSCONFDIR
+#define SYSCONFDIR _e_get_sysconfdir ()
+
+#undef DATADIR
+#define DATADIR _e_get_datadir ()
+
+#undef EVOLUTION_DATADIR
+#define EVOLUTION_DATADIR _e_get_datadir ()
+
+#undef LIBDIR
+#define LIBDIR _e_get_libdir ()
+
#undef EVOLUTION_GLADEDIR
#define EVOLUTION_GLADEDIR _e_get_gladedir ()
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index e1afa21758..a3c9be7b84 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -35,6 +35,10 @@
static const char *localedir = NULL;
/* The others are in UTF-8 */
+static const char *prefix;
+static const char *sysconfdir;
+static const char *datadir;
+static const char *libdir;
static const char *gladedir;
static const char *helpdir;
static const char *etspecdir;
@@ -103,6 +107,10 @@ setup (void)
g_free (cp_prefix);
+ prefix = g_strdup (full_prefix);
+ sysconfdir = replace_prefix (full_prefix, EVOLUTION_SYSCONFDIR);
+ datadir = replace_prefix (full_prefix, EVOLUTION_DATADIR);
+ libdir = replace_prefix (full_prefix, EVOLUTION_LIBDIR);
gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR);
helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR);
etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR);
@@ -131,6 +139,10 @@ _e_get_##varbl (void) \
}
GETTER(localedir)
+GETTER(prefix)
+GETTER(sysconfdir)
+GETTER(datadir)
+GETTER(libdir)
GETTER(gladedir)
GETTER(helpdir)
GETTER(etspecdir)