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

Renamed CHARSETS_INDEX macro to CHARSETS_LIST.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/fileloc.h

@@ -26,7 +26,7 @@
 #define MC_LOCAL_MENU		".mc.menu"
 #define MC_HINT			"mc.hint"
 #define GLOBAL_KEYMAP_FILE	"mc.keymap"
-#define CHARSETS_INDEX		"mc.charsets"
+#define CHARSETS_LIST		"mc.charsets"
 #define MC_LIB_EXT		"mc.ext"
 
 #define FISH_PREFIX		"fish"

misc/Makefile.am

@@ -2,18 +2,15 @@
 
 SUBDIRS = skins syntax
 
-if CHARSET
-LIBFILES_ADD = mc.charsets
-else
-LIBFILES_ADD =
-endif
-
 LIBFILES_OUT = mc.ext
 
 noinst_DATA = xterm.ad
 
 pkgdata_DATA = \
 	mc.lib
+if CHARSET
+pkgdata_DATA += mc.charsets
+endif
 
 LIBFILES_CONST = \
 	cedit.menu      \
@@ -32,13 +29,15 @@ CLEANFILES = $(SCRIPTS_OUT)
 cfgdir = $(sysconfdir)/@PACKAGE@
 cfg_DATA = \
 	$(LIBFILES_CONST) \
-	$(LIBFILES_OUT) \
-	$(LIBFILES_ADD)
+	$(LIBFILES_OUT)
 
 # Files processed by configure don't need to be here
 EXTRA_DIST = \
 	$(LIBFILES_CONST) \
 	$(SCRIPTS_IN) \
 	$(noinst_DATA) \
-	$(pkgdata_DATA) \
-	mc.charsets
+	$(pkgdata_DATA)
+#if CHARSET is defined, mc.charsets is already here
+if !CHARSET
+EXTRA_DIST += mc.charsets
+endif

src/charsets.c

@@ -56,13 +56,15 @@ load_codepages_list (void)
     char buf[BUF_MEDIUM];
     char *default_codepage = NULL;
 
-    fname = concat_dir_and_file (mc_home, CHARSETS_INDEX);
+    /* 1: try /usr/share/mc/mc.charsets */
+    fname = g_build_filename (mc_home_alt, CHARSETS_LIST, (char *) NULL);
     f = fopen (fname, "r");
     if (f == NULL) {
 	fprintf (stderr, _("Warning: file %s not found\n"), fname);
 	g_free (fname);
 
-	fname = concat_dir_and_file (mc_home_alt, CHARSETS_INDEX);
+	/* 2: try /etc/mc/mc.charsets */
+	fname = g_build_filename (mc_home, CHARSETS_LIST, (char *) NULL);
 	f = fopen (fname, "r");
 	if (f == NULL) {
 	    fprintf (stderr, _("Warning: file %s not found\n"), fname);