Merge branch '1424_non_config_files'

* 1424_non_config_files:
  Fixed file list in RPM spec.
  Install help files into /usr/share/mc/help instead of /usr/share/mc.
  Install hint files into /usr/share/mc/hints instead of /usr/share/mc.
  Load locale-specific info (help and hints) from /usr/share/mc only.
  Reimplemened codepages storage using GPtrArray.
  Install mc.charsets into /usr/share/mc instead of /etc/mc.
  Minor optimization of [Special dirs] handling.
  Install mc.lib into /usr/share/mc instead of /etc/mc.
  Ticket #1424: install some files into /usr/share/mc instead of /etc/mc.

contrib/dist/redhat/mc.spec.in

@@ -94,7 +94,7 @@ PKG_CONFIG_PATH="$RESULT_DIR/usr/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" ; export PK
         %{_with_screen} \
         %{?_with_glib_static} \
         --enable-charset \
-        --with-samba \
+        --enable-vfs-smb \
         --without-x \
         --with-gpm-mouse \
         --disable-doxygen-doc
@@ -140,9 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_sysconfdir}/profile.d/*
 
-%config %{_sysconfdir}/mc/Syntax
-%config %{_sysconfdir}/mc/mc.charsets
-%config %{_sysconfdir}/mc/mc.lib
 %config(noreplace) %{_sysconfdir}/mc/filehighlight.ini
 %config(noreplace) %{_sysconfdir}/mc/*edit*
 %config(noreplace) %{_sysconfdir}/mc/mc.ext
@@ -155,8 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/mc
 %{_datadir}/mc/*
 
-
 %changelog
+* Thu Sep 16 2010 Andrew Borodin <aborodin@vmail.ru>
+- Some files are installed now into %%{_datadir}/mc instead of %%{_sysconfdir}/mc.
+
 * Wed Apr 28 2010 Yury V. Zaytsev <yury@shurup.com>
 - Added mcdiff to the list of packaged files.
 

doc/hints/Makefile.am

@@ -1,11 +1,11 @@
-LIBFILES_OUT = mc.ext
-
-
-pkgdata_DATA = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
-	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk		\
+HINTFILES = \
+	mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
+	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk	\
 	mc.hint.zh
 
+hintdir = $(pkgdatadir)/hints
+hint_DATA = $(HINTFILES)
 
 # Files processed by configure don't need to be here
 EXTRA_DIST = \
-	$(pkgdata_DATA)
+	$(HINTFILES)

doc/hlp/Makefile.am

@@ -1,10 +1,11 @@
 DIST_SUBDIRS = es hu it pl ru sr
 SUBDIRS = $(DOC_LINGUAS)
 
-pkgdata_DATA = mc.hlp
+hlpdir = $(pkgdatadir)/help
+hlp_DATA = mc.hlp
 
 EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
+CLEANFILES = $(hlp_DATA)
 
 mc.hlp: $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp/man2hlp
 	- $(top_builddir)/src/man2hlp/man2hlp $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp mc.hlp

doc/hlp/es/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=es
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am

doc/hlp/hlp-lang-include.am

@@ -0,0 +1,10 @@
+MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
+
+hlpdir = $(pkgdatadir)/help
+hlp_DATA = mc.hlp.$(HLP_LANG)
+
+EXTRA_DIST = xnc.hlp
+CLEANFILES = $(hlp_DATA)
+
+mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
+	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

doc/hlp/hu/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=hu
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am

doc/hlp/it/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=it
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am

doc/hlp/pl/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=pl
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am

doc/hlp/ru/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=ru
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am

doc/hlp/sr/Makefile.am

@@ -1,9 +1,3 @@
 HLP_LANG=sr
-MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
-pkgdata_DATA = mc.hlp.$(HLP_LANG)
 
-EXTRA_DIST = xnc.hlp
-CLEANFILES = $(pkgdata_DATA)
-
-mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
-	- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)
+include ../hlp-lang-include.am