From 99bb93cb5a7fcc73b3b527337705c862cd11d17d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 10 Aug 2005 09:18:27 +0000 Subject: Pass also EVOLUTION_SYSCONFDIR, EVOLUTION_DATADIR and EVOLUTION_LIBDIR. 2005-08-10 Tor Lillqvist * Makefile.am: (INCLUDES): Pass also EVOLUTION_SYSCONFDIR, EVOLUTION_DATADIR and EVOLUTION_LIBDIR. * e-win32-reloc.c: Handle also the above, and the bare PREFIX. * 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.) svn path=/trunk/; revision=30073 --- e-util/e-win32-reloc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'e-util/e-win32-reloc.c') 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) -- cgit