X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=Makefile.in;h=efab88597f87c2b78fabec9aa55e7ea133283569;hp=7cd91b04f5f5bc85fe5d4a36e592d8d654fede91;hb=d1da1f94ce62160aebb30df4063ccbc53768656b;hpb=4c4e933cf4f3c7b74a5a17d7ac3caf1b06fccb85

diff --git a/Makefile.in b/Makefile.in
index 7cd91b0..efab885 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for top level of nmh distribution
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
@@ -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,13 +61,13 @@ 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 mkinstalldirs Makefile.in aclocal.m4	\
-	acconfig.h config.h.in configure.in configure stamp-h.in	\
+DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION \
+	ChangeLog install-sh mkinstalldirs 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 ==========
 
@@ -88,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
@@ -130,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 > $@