diff options
| author | Tor Lillqvist <tml@iki.fi> | 2009-01-06 09:36:52 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2009-01-06 09:36:52 +0000 |
| commit | 486510ff3d20c93e4fc83ba8a8b763c8cc548a44 (patch) | |
| tree | 762fb99d58d9baa981868ab0b1b7249e494dbfc9 | |
| parent | 935bf108b2dd9693c7f9f1e0752a03d2f0ccfbfa (diff) | |
| download | pango-486510ff3d20c93e4fc83ba8a8b763c8cc548a44.tar.gz | |
Bug 164001 - pango-querymodules doesn't work uninstalled on win32
2009-01-06 Tor Lillqvist <tml@iki.fi>
Bug 164001 - pango-querymodules doesn't work uninstalled on win32
* pango/pango-utils.c (pango_get_lib_subdirectory): When running
against an uninstalled, compile-time DLL, in the libtool-style
.libs folder, use the compile-time install prefix.
svn path=/trunk/; revision=2783
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | pango/pango-utils.c | 8 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2009-01-06 Tor Lillqvist <tml@iki.fi> + + Bug 164001 - pango-querymodules doesn't work uninstalled on win32 + + * pango/pango-utils.c (pango_get_lib_subdirectory): When running + against an uninstalled, compile-time DLL, in the libtool-style + .libs folder, use the compile-time install prefix. + 2009-01-03 Behdad Esfahbod <behdad@gnome.org> Bug 384362 – pango can't select some font styles diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 78e969fb..72a84fa3 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -727,7 +727,13 @@ pango_get_lib_subdirectory (void) if (result == NULL) { gchar *root = g_win32_get_package_installation_directory_of_module (pango_dll); - result = g_build_filename (root, "lib\\pango", NULL); + /* If we are running against an uninstalled copy of the Pango DLL, + * use the compile-time installation prefix. + */ + if (g_str_has_suffix (root, "\\.libs")) + result = g_strdup (LIBDIR "/pango"); + else + result = g_build_filename (root, "lib\\pango", NULL); g_free (root); } return result; |