Fix relative module paths

So that the created absolute path is where the modules are installed
instead of where the modules file is installed (i.e.,
lib/pango/1.8.0/modules instead of etc/pango).

diff --git a/pango/modules.c b/pango/modules.c
index 644cc9c..c5a19f2 100644 (file)
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -450,11 +450,17 @@ process_module_file (FILE *module_file, const gchar *module_file_dir)
          switch (i)
            {
            case 0:
-             if (!g_path_is_absolute (tmp_buf->str)) {
-               const gchar *abs_file_name = g_build_filename (module_file_dir, tmp_buf->str, NULL);
-               g_string_assign (tmp_buf, abs_file_name);
-               g_free ((gpointer) abs_file_name);
-             }
+             if (!g_path_is_absolute (tmp_buf->str))
+               {
+                 const gchar *lib_dir = pango_get_lib_subdirectory ();
+                 const gchar *abs_file_name = g_build_filename (lib_dir,
+                                                                MODULE_VERSION,
+                                                                "modules",
+                                                                tmp_buf->str,
+                                                                NULL);
+                 g_string_assign (tmp_buf, abs_file_name);
+                 g_free ((gpointer) abs_file_name);
+               }
              pair->module = find_or_create_module (tmp_buf->str);
              break;
            case 1: