X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=Makefile.in;h=83af4c2470b516c1536b1e2ea6396f15165fe60b;hp=2f63dad37df43d74ff4b41aa77beeba884956f5f;hb=5faf465b84082afa8bb85ce6fe87ce6675749675;hpb=ffe93d6dc707aaf92529cefb38a1814956b48c9e

diff --git a/Makefile.in b/Makefile.in
index 2f63dad..83af4c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
 #
-# Makefile for top level of nmh distribution
+# Makefile for top level of mmh distribution
 #
 
-# nmh version
+# mmh version
 VERSION = @VERSION@
 
 SHELL = /bin/sh
@@ -26,9 +26,12 @@ bindir      = @bindir@
 # location of support binaries and scripts
 libdir      = @libdir@
 
-# location of nmh configuration and formats files
+# location of mmh configuration and formats files
 etcdir      = @sysconfdir@
 
+# location of ...
+datarootdir = @datarootdir@
+
 # location of man pages
 mandir      = @mandir@
 
@@ -61,13 +64,16 @@ INSTALL_DATA    = @INSTALL_DATA@
 .SUFFIXES:
 
 # all files in this directory included in the distribution
-DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION \
-	ChangeLog install-sh Makefile.in aclocal.m4 \
+DIST = COPYRIGHT DATE INSTALL README VERSION \
+	autogen.sh install-sh Makefile.in aclocal.m4 \
 	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 ==========
 
@@ -99,6 +105,7 @@ superclean:  superclean-recursive  superclean-local
 
 mostlyclean-local:
 	rm -f *~
+	rm -rf autom4te.cache
 
 clean-local: mostlyclean-local
 
@@ -149,20 +156,17 @@ reset:
 	cd $(srcdir) && autoconf
 	cd $(srcdir) && date > stamp-h.in
 
-# name of new nmh distribution tar file
-tarfile = nmh-$(VERSION).tar.gz
-
-# ftp directory location
-ftpdir = /ftp/nmh
+# name of new mmh distribution tar file
+tarfile = mmh-$(VERSION).tar.gz
 
-# file containing name of new nmh distribution
+# file containing name of new mmh distribution
 distname:
-	@echo nmh-$(VERSION) > distname
+	@echo mmh-$(VERSION) > distname
 
-# build nmh distribution
+# build mmh distribution
 distdir = `cat distname`
-nmhdist: $(DIST) distname
-	@echo "Begin building nmh-$(VERSION) distribution"
+mmhdist: $(DIST) distname
+	@echo "Begin building mmh-$(VERSION) distribution"
 	rm -rf $(distdir)
 	mkdir $(distdir)
 	@chmod 755 $(distdir)
@@ -170,6 +174,10 @@ nmhdist: $(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; \
@@ -178,13 +186,4 @@ nmhdist: $(DIST) distname
 	chmod -R a+r $(distdir)
 	tar chf - $(distdir) | gzip -c > $(tarfile)
 	rm -rf $(distdir) distname
-	@echo "Done building nmh-$(VERSION) distribution"
-
-# release a new nmh distribution into ftp directory
-nmhrelease:
-	rm -f $(ftpdir)/$(tarfile)
-	rm -f $(ftpdir)/nmh.tar.gz
-	mv $(tarfile) $(ftpdir)/$(tarfile)
-	cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
-	cd $(ftpdir) && md5sum *.gz > MD5SUM
-
+	@echo "Done building mmh-$(VERSION) distribution"