Include `test' dir in release tarball

The subdirectories `docs' and `test' are managed by the top-level
Makefile now, because there's nothing to do in them but to copy
them for the distribution tarball. (This way, we also don't have
to include each new file in these directories to the file list in
Makefile.in.)

diff --git a/Makefile.in b/Makefile.in
index 058e7d8..83af4c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,8 +69,11 @@ DIST = COPYRIGHT DATE INSTALL README VERSION \
        acconfig.h config.h.in configure.ac configure stamp-h.in \
        config.sub config.guess
 
+# these directories included in the distribution
+DISTDIRS = docs test
+
 # subdirectories in distribution
-SUBDIRS = h config sbr uip etc man docs
+SUBDIRS = h config sbr uip etc man
 
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
@@ -171,6 +174,10 @@ mmhdist: $(DIST) distname
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \
        done
+       @echo "Copying distribution dirs in main directory"
+       @for dir in $(DISTDIRS); do \
+         cp -rp $(srcdir)/$$dir $(distdir); \
+       done
        @for subdir in $(SUBDIRS); do \
          mkdir $(distdir)/$$subdir; \
          chmod 755 $(distdir)/$$subdir; \

diff --git a/configure.ac b/configure.ac
index 2cda6e0..9e32e21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -547,7 +547,7 @@ dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
-                etc/Makefile docs/Makefile man/Makefile)
+                etc/Makefile man/Makefile)
 AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
 AC_OUTPUT
 

diff --git a/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644 (file)
index a30292b..0000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Makefile for h subdirectory
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-datarootdir = @datarootdir@
-VPATH  = @srcdir@
-
-# header files included in distribution
-FILES = COMPLETION-BASH COMPLETION-TCSH COMPLETION-ZSH \
-        ChangeLog_MH-3_to_MH-6.6 ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
-        ChangeLog_nmh \
-        DIFFERENCES_nmh_MH DIFFERENCES_mmh_nmh \
-        TODO MACHINES FAQ MAILING-LISTS \
-        README.start-devel README.developers README.releasing \
-        README.manpages README.mail-filtering README.mhsign-mhpgp \
-        README.attachments README.hooks \
-        schnalke-mmh.pdf \
-        m_getfld.c.humor
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(FILES) $(AUX)
-
-# ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all:
-
-install:
-
-uninstall:
-
-lint:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
-       rm -f *~
-
-clean: mostlyclean
-
-distclean: clean
-       rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = docs
-
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist:
-       @echo "Copying distribution files in $(subdir)"
-       @for file in $(DIST); do \
-         cp -p $(srcdir)/$$file $(distdir); \
-       done
-