* */Makefile.am: Replace mclibdir with pkgdatadir to use "share"

directory for architecture-independent files.

ChangeLog

@@ -1,3 +1,8 @@
+2002-09-21  Pavel Roskin  <proski@gnu.org>
+
+	* */Makefile.am: Replace mclibdir with pkgdatadir to use "share"
+	directory for architecture-independent files.
+
 2002-09-19  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/m4.syntax: New file.

doc/Makefile.am

@@ -6,11 +6,10 @@ else
 man_MANS = mc.1 mcedit.1
 endif
 
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp
+pkgdata_DATA = mc.hlp
 
 EXTRA_DIST = DEVEL xnc.hlp
-CLEANFILES = $(mclib_DATA)
+CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp 58 mc.1 $(srcdir)/xnc.hlp mc.hlp

doc/es/Makefile.am

@@ -1,11 +1,10 @@
 mandir = @mandir@/es
 man_MANS = mc.1
 
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp.es
+pkgdata_DATA = mc.hlp.es
 
 EXTRA_DIST = xnc.hlp
-CLEANFILES = $(mclib_DATA)
+CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp.es: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp 58 mc.1 $(srcdir)/xnc.hlp mc.hlp.es

doc/hu/Makefile.am

@@ -1,4 +1,3 @@
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp.hu
+pkgdata_DATA = mc.hlp.hu
 
-EXTRA_DIST = $(mclib_DATA)
+EXTRA_DIST = $(pkgdata_DATA)

doc/it/Makefile.am

@@ -1,11 +1,10 @@
 mandir = @mandir@/it
 man_MANS = mc.1
 
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp.it
+pkgdata_DATA = mc.hlp.it
 
 EXTRA_DIST = xnc.hlp
-CLEANFILES = $(mclib_DATA)
+CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp.it: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp 58 mc.1 $(srcdir)/xnc.hlp mc.hlp.it

doc/pl/Makefile.am

@@ -1,10 +1,9 @@
 mandir = @mandir@/pl
 man_MANS = mc.1
 
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp.pl
+pkgdata_DATA = mc.hlp.pl
 
-CLEANFILES = $(mclib_DATA)
+CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp.pl: mc.1 $(top_srcdir)/doc/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp 58 mc.1 $(top_srcdir)/doc/xnc.hlp \

doc/ru/Makefile.am

@@ -1,11 +1,10 @@
 mandir = @mandir@/ru
 man_MANS = mc.1
 
-mclibdir = $(libdir)/mc
-mclib_DATA = mc.hlp.ru
+pkgdata_DATA = mc.hlp.ru
 
 EXTRA_DIST = xnc.hlp
-CLEANFILES = $(mclib_DATA)
+CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp.ru: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp 58 mc.1 $(srcdir)/xnc.hlp mc.hlp.ru

lib/Makefile.am

@@ -1,6 +1,5 @@
-mclibdir   = $(libdir)/mc
-suppbindir = $(mclibdir)/bin
-tidir      = $(mclibdir)/term
+suppbindir = $(pkgdatadir)/bin
+tidir      = $(pkgdatadir)/term
 
 if CHARSET
 LIBFILES_ADD = mc.charsets
@@ -22,7 +21,7 @@ noinst_SCRIPTS = tdiff
 suppbin_SCRIPTS = mc.csh mc.sh
 ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
 
-mclib_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT)
+pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT)
 
 # Files processed by configure don't need to be here
 EXTRA_DIST = \

src/Makefile.am

@@ -1,8 +1,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS)
-AM_CPPFLAGS = -DLIBDIR=\""$(mclibdir)/"\" -DLOCALEDIR=\""$(localedir)"\"
+AM_CPPFLAGS = -DLIBDIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
 
-mclibdir = $(libdir)/mc
-suppbindir = $(mclibdir)/bin
+suppbindir = $(pkglibdir)/bin
 localedir = $(datadir)/locale
 
 bin_PROGRAMS = mc mcmfmt

syntax/Makefile.am

@@ -1,5 +1,4 @@
-mclibdir = $(libdir)/mc
-syntaxdir = $(mclibdir)/syntax
+syntaxdir = $(pkgdatadir)/syntax
 
 syntax_DATA =			\
 	Syntax			\

vfs/extfs/Makefile.am

@@ -1,5 +1,4 @@
-mclibdir = $(libdir)/mc
-extfsdir = $(mclibdir)/extfs
+extfsdir = $(pkgdatadir)/extfs
 
 # Files to install and distribute, but not filters
 EXTFS_MISC  = README extfs.ini unarj.diff sfs.ini