X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=Makefile.in;h=a3b6fe27690d6257431707b72a2a6cf376faa9ad;hp=32a5057c32797b5de61da93c74b6dc03c5f52796;hb=8edf2fa76c7b6d224d3f1b8cc7a764e624c45816;hpb=97e7d6f2f5db4e8f09cb015ee6c2da2ff129f963

diff --git a/Makefile.in b/Makefile.in
index 32a5057..a3b6fe2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,8 @@
 #
-# Makefile for top level of nmh distribution
-#
-# $Id$
+# Makefile for top level of mmh distribution
 #
 
-# nmh version
+# mmh version
 VERSION = @VERSION@
 
 SHELL = /bin/sh
@@ -28,7 +26,7 @@ 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 man pages
@@ -40,15 +38,9 @@ mailspool   = @mailspool@
 # location of mail transport agent
 sendmailpath = @sendmailpath@
 
-# default editor
-default_editor = @editorpath@
-
-# default pager
-default_pager = @pagerpath@
-
 CC       = @CC@
 CPPFLAGS = @CPPFLAGS@
-DEFS     = @DEFS@
+DEFS     = @DEFS@ @OURDEFS@
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@
 LIBS     = @LIBS@
@@ -60,8 +52,7 @@ MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
 CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
 prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
 etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
-mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
-default_editor='$(default_editor)' default_pager='$(default_pager)'
+mailspool='$(mailspool)' sendmailpath='$(sendmailpath)'
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -70,12 +61,13 @@ INSTALL_DATA    = @INSTALL_DATA@
 .SUFFIXES:
 
 # all files in this directory included in the distribution
-DIST = ChangeLog COPYRIGHT INSTALL MACHINES README VERSION ChangeLog install-sh\
-       mkinstalldirs Makefile.in aclocal.m4 acconfig.h config.h.in \
-       configure.in configure stamp-h.in config.sub config.guess 
+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
 
 # subdirectories in distribution
-SUBDIRS = h config sbr mts uip etc man docs
+SUBDIRS = h config sbr uip etc man docs
 
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
@@ -87,7 +79,12 @@ all-recursive:
 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
 	done
 
-install uninstall:
+install: all
+	for subdir in $(SUBDIRS); do \
+	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
+	done
+
+uninstall:
 	for subdir in $(SUBDIRS); do \
 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
 	done
@@ -129,20 +126,20 @@ lint:
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	./config.status $@
 
 config.status: configure VERSION
 	./config.status --recheck
 
-configure: configure.in aclocal.m4
+configure: configure.ac aclocal.m4
 	cd $(srcdir) && autoconf
 
 config.h: stamp-h
 stamp-h: config.h.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+	./config.status config.h stamp
 
 config.h.in: stamp-h.in
-stamp-h.in: configure.in acconfig.h aclocal.m4
+stamp-h.in: configure.ac acconfig.h aclocal.m4
 	cd $(srcdir) && autoheader
 	date > $@
 
@@ -152,20 +149,20 @@ reset:
 	cd $(srcdir) && autoconf
 	cd $(srcdir) && date > stamp-h.in
 
-# name of new nmh distribution tar file
-tarfile = nmh-$(VERSION).tar.gz
+# name of new mmh distribution tar file
+tarfile = mmh-$(VERSION).tar.gz
 
 # ftp directory location
-ftpdir = /ftp/nmh
+ftpdir = /ftp/mmh
 
-# 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)
@@ -181,13 +178,13 @@ nmhdist: $(DIST) distname
 	chmod -R a+r $(distdir)
 	tar chf - $(distdir) | gzip -c > $(tarfile)
 	rm -rf $(distdir) distname
-	@echo "Done building nmh-$(VERSION) distribution"
+	@echo "Done building mmh-$(VERSION) distribution"
 
-# release a new nmh distribution into ftp directory
-nmhrelease:
+# release a new mmh distribution into ftp directory
+mmhrelease: $(tarfile)
 	rm -f $(ftpdir)/$(tarfile)
-	rm -f $(ftpdir)/nmh.tar.gz
+	rm -f $(ftpdir)/mmh.tar.gz
 	mv $(tarfile) $(ftpdir)/$(tarfile)
-	cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
+	cd $(ftpdir) && ln -s $(tarfile) mmh.tar.gz
 	cd $(ftpdir) && md5sum *.gz > MD5SUM