Changeset 254

Timestamp:

06/05/08 13:30:39 (4 years ago)

Author:

ath

Message:

Really fix the last commit.

Location:

trunk/fm_gui

Files:

• global.c (deleted)
• src/global.c (modified) (4 diffs)

trunk/fm_gui/src/global.c

@@ +1 @@
+#include <string.h>
 #include <glib.h>
 #ifdef G_OS_WIN32
@@ -13 +14 @@
 #include "binreloc.h"
 
+#define LIBDIR_SUFFIX ".libs"
+
 
 static gchar *prefix;
-static gchar *exe_path;
 static gchar *bin_path;
 //static gchar *lib_path;
@@ -25 +27 @@
 {
         GError *err = NULL;
+        gchar *prefix_temp;
 
 #ifdef G_OS_WIN32
-        TCHAR path[MAX_PATH];
+        TCHAR exe_filename[MAX_PATH];
         
-        GetModuleFileName (NULL, path, MAX_PATH);
+        GetModuleFileName (NULL, exe_filename, MAX_PATH);
         
         exe_path = g_path_get_dirname (path);
+        g_print ("Executable is %s\n", exe_filename);
+        prefix_temp = g_strdup (prefix_temp);
 #else
+
+        gboolean in_source_dir;
+
         if (gbr_init (&err))
                 g_print("binreloc available!\n");
@@ -41 +49 @@
         if (!exe_filename)
                 g_warning ("Can't determine installation prefix!");
+        else
+                g_print ("Executable is %s\n", exe_filename);
 
-        exe_path = g_path_get_dirname (exe_filename);   
-        g_free (exe_filename);
+        prefix_temp = g_path_get_dirname (exe_filename);
+        g_print ("prefix_temp %s\n", prefix_temp);
+        gchar *basename = g_path_get_basename (prefix_temp);
+        g_print ("basename %s\n", basename);
+
+        if (strcmp (basename, LIBDIR_SUFFIX) == 0) {
+                g_print ("we are in a libtool temporary directory, adjusting path...\n");
+
+                prefix_temp = g_strdup (prefix_temp);
+                prefix_temp[strlen (prefix_temp) - strlen (LIBDIR_SUFFIX) - 1] = '\0';
+        }
+
+        g_free (basename);
+
+        basename = g_path_get_basename (prefix_temp);
+
+        if (strcmp (basename, "src") == 0)
+                in_source_dir = TRUE;
+        else
+                in_source_dir = FALSE;
+
+        prefix_temp[strlen (prefix_temp) - strlen (basename)] = '\0';
+
+        g_free (basename);
+
+
 #endif
 
-        gchar *makefile_name = g_build_filename (exe_path, "Makefile.am", NULL);
-        gchar *data_path_temp = NULL;
-        if (g_file_test (makefile_name, G_FILE_TEST_EXISTS)) {
-                g_print ("%s exists, we are in the source directory\n", makefile_name);
+        g_print ("base path %s --- ", prefix_temp);
+        if (in_source_dir) {
+                g_print ("source directory\n");
 
-                prefix = g_path_get_dirname (exe_path);
-                bin_path = g_strdup (exe_path);
+                prefix = g_strdup (prefix_temp);
+                bin_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "src", NULL);
                 data_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "data", NULL);
+
         } else {
-                prefix = gbr_find_prefix (PREFIX);
+                g_print ("installation directory\n");
 
-#ifdef G_OS_WIN32       
-                bin_path = g_build_path (G_DIR_SEPARATOR_S, path, "bin", NULL);
-//              lib_path = g_build_path (G_DIR_SEPARATOR_S, path, "lib", NULL);
-                data_path_temp = g_build_path (G_DIR_SEPARATOR_S, path, "share", NULL);
-#else
-                bin_path = gbr_find_lib_dir (PREFIX "/bin");
-//              lib_path = gbr_find_lib_dir (PREFIX "/lib");
-                data_path_temp = gbr_find_data_dir (PREFIX "/share/fm_gui");
-#endif
-                data_path = g_build_path (G_DIR_SEPARATOR_S, data_path_temp, "fm_gui", NULL);
+                prefix = g_strdup (prefix_temp);
+                bin_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "bin", NULL);
+                data_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "share", PACKAGE, NULL);
+
         }
-
-
         
-        g_free (makefile_name);
+        g_free (prefix_temp);
 
         g_print ("prefix %s\n", prefix);
-        g_print ("exe_path %s\n", exe_path);
+        g_print ("bin_path %s\n", bin_path);
         g_print ("data_path %s\n", data_path);
 }