Browse Source

Install mc.lib into /usr/share/mc instead of /etc/mc.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 14 years ago
parent
commit
fed3d099c3
2 changed files with 4 additions and 4 deletions
  1. 2 2
      misc/Makefile.am
  2. 2 2
      src/setup.c

+ 2 - 2
misc/Makefile.am

@@ -12,13 +12,13 @@ LIBFILES_OUT = mc.ext
 
 noinst_DATA = xterm.ad
 
-pkgdata_DATA =
+pkgdata_DATA = \
+	mc.lib
 
 LIBFILES_CONST = \
 	cedit.menu      \
 	edit.indent.rc \
 	edit.spell.rc \
-	mc.lib \
 	filehighlight.ini \
 	mc.keymap \
 	mc.keymap.default \

+ 2 - 2
src/setup.c

@@ -731,11 +731,11 @@ load_setup (void)
 
     /* mc.lib is common for all users, but has priority lower than
        ~/.mc/ini.  FIXME: it's only used for keys and treestore now */
-    global_profile_name = concat_dir_and_file (mc_home, MC_GLOBAL_CONFIG_FILE);
+    global_profile_name = g_build_filename (mc_home, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
     if (!exist_file (global_profile_name))
     {
         g_free (global_profile_name);
-        global_profile_name = concat_dir_and_file (mc_home_alt, MC_GLOBAL_CONFIG_FILE);
+        global_profile_name = g_build_filename (mc_home_alt, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
     }
 
     panels_profile_name = g_build_filename (home_dir, MC_USERCONF_DIR, MC_PANELS_FILE, NULL);