diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-08-10 06:53:23 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-08-10 06:53:23 +0800 |
| commit | d2d726ba6eef71e869ad7dec3d0918fea04809db (patch) | |
| tree | 51f4f37213ad926031167a45f148ec0fd6a1865e | |
| parent | 660d7f8ba193b8ca8a65a66986e8a62f0cbda9e1 (diff) | |
| download | gsoc2013-evolution-d2d726ba6eef71e869ad7dec3d0918fea04809db.tar.gz gsoc2013-evolution-d2d726ba6eef71e869ad7dec3d0918fea04809db.tar.zst gsoc2013-evolution-d2d726ba6eef71e869ad7dec3d0918fea04809db.zip | |
Use privsolib instead of privlib. On Unix they are the same, on Win32
2005-08-10 Tor Lillqvist <tml@novell.com>
* 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
handle them, too.
* e-win32-reloc.c: Handle also the above two paths.
svn path=/trunk/; revision=30061
| -rw-r--r-- | e-util/ChangeLog | 10 | ||||
| -rw-r--r-- | e-util/Makefile.am | 6 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 9 |
3 files changed, 23 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index c80f44b93a..36a2f2f172 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,13 @@ +2005-08-10 Tor Lillqvist <tml@novell.com> + + * 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 + handle them, too. + + * e-win32-reloc.c: Handle also the above two paths. + 2005-07-11 Vivek Jain <jvivek@novell.com> * e-config.c: (e_config_target_changed): diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 6e8656bb96..f1bc029e7e 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -20,8 +20,10 @@ INCLUDES = \ -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DSEARCH_RULE_DIR=\"$(ruledir)\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ -DG_LOG_DOMAIN=\"e-utils\" \ $(GNOME_PILOT_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ @@ -29,7 +31,7 @@ INCLUDES = \ $(ICONV_CFLAGS) \ $(E_UTIL_CFLAGS) -privlib_LTLIBRARIES = libeutil.la libeconduit.la +privsolib_LTLIBRARIES = libeutil.la libeconduit.la eutilinclude_HEADERS = \ e-account-list.h \ diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 3cb394eb77..e1afa21758 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -45,6 +45,8 @@ static const char *plugindir; static const char *privdatadir; static const char *search_rule_dir; static const char *galviewsdir; +static const char *libexecdir; +static const char *sounddir; static HMODULE hmodule; G_LOCK_DEFINE_STATIC (mutex); @@ -94,9 +96,11 @@ setup (void) return; } + /* This requires that the libeutil DLL is installed in $bindir */ gnome_win32_get_prefixes (hmodule, &full_prefix, &cp_prefix); localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR); + g_free (cp_prefix); gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); @@ -108,6 +112,9 @@ setup (void) privdatadir = replace_prefix (full_prefix, EVOLUTION_PRIVDATADIR); search_rule_dir = replace_prefix (full_prefix, SEARCH_RULE_DIR); galviewsdir = replace_prefix (full_prefix, EVOLUTION_GALVIEWSDIR); + libexecdir = replace_prefix (full_prefix, EVOLUTION_LIBEXECDIR); + sounddir = replace_prefix (full_prefix, EVOLUTION_SOUNDDIR); + g_free (full_prefix); G_UNLOCK (mutex); @@ -134,3 +141,5 @@ GETTER(plugindir) GETTER(privdatadir) GETTER(search_rule_dir) GETTER(galviewsdir) +GETTER(libexecdir) +GETTER(sounddir) |