1 files changed, 7 insertions, 1 deletions
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;