diff -ur mc-4.6.1-noutf/lib/Makefile.am mc-4.6.1-RH/lib/Makefile.am --- mc-4.6.1-noutf/lib/Makefile.am 2003-09-23 08:11:19.000000000 +0200 +++ mc-4.6.1-RH/lib/Makefile.am 2007-07-09 22:25:37.000000000 +0200 @@ -6,11 +6,11 @@ LIBFILES_ADD = endif -LIBFILES_OUT = mc.ext +LIBFILES_OUT = mc.ext mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc \ + edit.spell.rc LIBFILES_CONST = 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 mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc \ - edit.spell.rc + mc.hint.zh noinst_DATA = README.xterm mcserv.init mcserv.pamd xterm.ad @@ -19,7 +19,10 @@ suppbin_SCRIPTS = $(SCRIPTS_OUT) -pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT) +pkgdata_DATA = $(LIBFILES_CONST) + +pkgsysconfdir = $(sysconfdir)/@PACKAGE@/ +pkgsysconf_DATA = $(LIBFILES_OUT) $(LIBFILES_ADD) CLEANFILES = $(SCRIPTS_OUT) diff -ur mc-4.6.1-noutf/syntax/Makefile.am mc-4.6.1-RH/syntax/Makefile.am --- mc-4.6.1-noutf/syntax/Makefile.am 2007-07-08 19:23:57.000000000 +0200 +++ mc-4.6.1-RH/syntax/Makefile.am 2007-07-09 22:18:49.000000000 +0200 @@ -1,5 +1,4 @@ SYNTAXFILES = \ - Syntax \ ada95.syntax \ aspx.syntax \ assembler.syntax \ @@ -47,6 +46,8 @@ if USE_EDIT syntaxdir = $(pkgdatadir)/syntax syntax_DATA = $(SYNTAXFILES) +pkgsysconfdir = $(sysconfdir)/@PACKAGE@/syntax +pkgsysconf_DATA = Syntax endif -EXTRA_DIST = $(SYNTAXFILES) +EXTRA_DIST = $(SYNTAXFILES) Syntax diff -ur mc-4.6.1-noutf/vfs/extfs/Makefile.am mc-4.6.1-RH/vfs/extfs/Makefile.am --- mc-4.6.1-noutf/vfs/extfs/Makefile.am 2007-07-08 19:23:57.000000000 +0200 +++ mc-4.6.1-RH/vfs/extfs/Makefile.am 2007-07-08 20:58:30.000000000 +0200 @@ -1,7 +1,10 @@ extfsdir = $(pkgdatadir)/extfs +# Configuration files +EXTFS_CONFIG_FILES = extfs.ini sfs.ini + # Files to install and distribute other than extfs scripts -EXTFS_MISC = README extfs.ini sfs.ini +EXTFS_MISC = README # Scripts hat don't need adaptation to the local system EXTFS_CONST = bpp rpm trpm u7z @@ -55,9 +58,11 @@ uzoo if USE_VFS +pkgsysconfdir = $(sysconfdir)/@PACKAGE@/extfs +pkgsysconf_DATA = $(EXTFS_CONFIG_FILES) extfs_DATA = $(EXTFS_MISC) extfs_SCRIPTS = $(EXTFS_CONST) $(EXTFS_OUT) endif -EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) +EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFS_CONFIG_FILES) diff -ur mc-4.6.1-noutf/vfs/Makefile.am mc-4.6.1-RH/vfs/Makefile.am --- mc-4.6.1-noutf/vfs/Makefile.am 2007-07-08 19:23:57.000000000 +0200 +++ mc-4.6.1-RH/vfs/Makefile.am 2007-07-08 20:48:05.000000000 +0200 @@ -12,6 +12,8 @@ AM_CFLAGS = $(GLIB_CFLAGS) endif +AM_CPPFLAGS = -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\" + BASICFILES = \ cpio.c \ direntry.c \