pango r2783 - in trunk: . pango

[tml svn gnome org]

Author: tml
Date: Tue Jan  6 09:36:52 2009
New Revision: 2783
URL: http://svn.gnome.org/viewvc/pango?rev=2783&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/pango/pango-utils.c

Modified: trunk/pango/pango-utils.c
==============================================================================
--- trunk/pango/pango-utils.c	(original)
+++ trunk/pango/pango-utils.c	Tue Jan  6 09:36:52 2009
@@ -727,7 +727,13 @@
   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;