From 52897029dc844680cb126d6d653441f6f429b8d2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT service" <weigelt@metux.de>
Date: Sat, 10 Jan 2009 16:26:14 +0100
Subject: [PATCH] mc.qpg.in mc.spec.in pkginfo.in prototype.in: moved to
 contrib/dist

---
 Makefile.am                               |  4 ++--
 configure.ac                              | 21 +++++++++++++--------
 contrib/Makefile.am                       |  3 +++
 contrib/dist/Makefile.am                  |  9 +++++++++
 mc.qpg.in => contrib/dist/mc.qpg.in       |  0
 mc.spec.in => contrib/dist/mc.spec.in     |  0
 pkginfo.in => contrib/dist/pkginfo.in     |  0
 prototype.in => contrib/dist/prototype.in |  0
 8 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 contrib/Makefile.am
 create mode 100644 contrib/dist/Makefile.am
 rename mc.qpg.in => contrib/dist/mc.qpg.in (100%)
 rename mc.spec.in => contrib/dist/mc.spec.in (100%)
 rename pkginfo.in => contrib/dist/pkginfo.in (100%)
 rename prototype.in => contrib/dist/prototype.in (100%)

diff --git a/Makefile.am b/Makefile.am
index f8697f9a0..e68ee6ed3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs edit src lib doc syntax
+SUBDIRS = intl po vfs edit src lib doc syntax contrib
 
-EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO pkginfo.in prototype.in mc.qpg mc.spec
+EXTRA_DIST = 
 
 noinst_DATA = mc.spec mc.qpg pkginfo prototype
 dist_noinst_SCRIPTS = build-glib2.sh
diff --git a/configure.ac b/configure.ac
index ade3c76ac..5d0fbd7a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,14 +550,15 @@ AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
 AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
 
 AC_CONFIG_FILES([
-Makefile 
-mc.spec
-mc.qpg
-pkginfo
-prototype
-doc/Makefile 
-vfs/Makefile
-vfs/extfs/Makefile
+Makefile
+
+contrib/Makefile
+contrib/dist/Makefile 
+contrib/dist/mc.spec
+contrib/dist/mc.qpg
+contrib/dist/pkginfo
+contrib/dist/prototype
+
 lib/Makefile
 
 src/Makefile
@@ -566,6 +567,9 @@ src/search/Makefile
 edit/Makefile 
 syntax/Makefile
 lib/mc.ext
+
+vfs/Makefile
+vfs/extfs/Makefile
 vfs/extfs/a
 vfs/extfs/apt
 vfs/extfs/audio
@@ -591,6 +595,7 @@ vfs/extfs/urar
 vfs/extfs/uzip
 vfs/extfs/uzoo
 
+doc/Makefile 
 doc/man/mc.1 doc/man/mcedit.1 doc/man/mcview.1 doc/man/mcserv.8 doc/man/Makefile
 doc/man/es/mc.1 doc/man/es/Makefile
 doc/man/hu/mc.1 doc/man/hu/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000000000..d18c40af2
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,3 @@
+## Process this file with automake to create Makefile.in.
+
+SUBDIRS = dist
diff --git a/contrib/dist/Makefile.am b/contrib/dist/Makefile.am
new file mode 100644
index 000000000..6417c4d42
--- /dev/null
+++ b/contrib/dist/Makefile.am
@@ -0,0 +1,9 @@
+
+AUTOMAKE_OPTIONS = 1.5
+
+EXTRA_DIST = pkginfo.in prototype.in mc.qpg.in mc.spec.in
+
+noinst_DATA = mc.spec mc.qpg pkginfo prototype
+
+ACLOCAL_AMFLAGS = -I m4
+
diff --git a/mc.qpg.in b/contrib/dist/mc.qpg.in
similarity index 100%
rename from mc.qpg.in
rename to contrib/dist/mc.qpg.in
diff --git a/mc.spec.in b/contrib/dist/mc.spec.in
similarity index 100%
rename from mc.spec.in
rename to contrib/dist/mc.spec.in
diff --git a/pkginfo.in b/contrib/dist/pkginfo.in
similarity index 100%
rename from pkginfo.in
rename to contrib/dist/pkginfo.in
diff --git a/prototype.in b/contrib/dist/prototype.in
similarity index 100%
rename from prototype.in
rename to contrib/dist/prototype.in