From 486510ff3d20c93e4fc83ba8a8b763c8cc548a44 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 6 Jan 2009 09:36:52 +0000 Subject: Bug 164001 - pango-querymodules doesn't work uninstalled on win32 2009-01-06 Tor Lillqvist 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 --- ChangeLog | 8 ++++++++ pango/pango-utils.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1591a1dd..59dc3809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-06 Tor Lillqvist + + 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 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; -- cgit v1.2.1