X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=etc%2FMakefile.in;h=10111e7c30ff6365f728cbb3301611e3d42a7b2c;hb=0e82199cf3c991a173e0ac8aa776efdb3ded61e6;hp=8fb3ea2fc1fcb5334ef9e2eef9b3a1e7e6b94b9f;hpb=7d327ff038f743228a91fd53fa4c8f47c5c44e96;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 8fb3ea2..10111e7 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -16,13 +14,11 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-MTS         = @MTS@
 mailspool   = @mailspool@
-masquerade  = @masquerade@
-smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
 # Path to search for programs to handle MIME
@@ -38,21 +34,18 @@ SED = sed
 .SUFFIXES:
 
 # static configuration, format, and components files
-STATIC_FILES =  MailAliases components digestcomps distcomps forwcomps	\
-		mhl.body mhl.digest mhl.format mhl.forward mhl.headers	\
-		mhl.reply rcvdistcomps rcvdistcomps.outbox		\
-	       	replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD	\
-	       	scan.default scan.mailx scan.nomime scan.size scan.time	\
-	       	scan.timely scan.unseen
+STATIC_FILES = components digestcomps distcomps forwcomps  \
+               mhl.body mhl.digest mhl.format mhl.forward mhl.headers  \
+               mhl.reply rcvdistcomps rcvdistcomps.outbox              \
+               replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD      \
+               scan.nmh scan.mailx scan.nomime scan.size scan.time \
+               scan.timely scan.unseen
 
 # templates and scripts from which non-static files are generated
-GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
-
-# scripts generated using above GENERATED_FILE_SRCs
-GENERATED_BIN_FILES = sendfiles
+GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh
 
 # non-scripts generated using above GENERATED_FILE_SRCs
-GENERATED_ETC_FILES = mhn.defaults mts.conf
+GENERATED_ETC_FILES = mhn.defaults
 
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
@@ -62,31 +55,13 @@ DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GENERATED_BIN_FILES) $(GENERATED_ETC_FILES)
+all: $(GENERATED_ETC_FILES)
 
 mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
 	$(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
-mts.conf: $(srcdir)/mts.conf.in Makefile
-	rm -f $@
-	$(SED) -e 's,%mts%,$(MTS),' \
-	       -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(etcdir),' \
-	       -e 's,%masquerade%,$(masquerade),' \
-	       -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
-
-sendfiles: $(srcdir)/sendfiles.in Makefile
-	rm -f $@
-	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
-
-install: install-bin-files install-etc-files
-
-install-bin-files:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-	for script in $(GENERATED_BIN_FILES); do \
-	  $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
-	done
+install: install-etc-files
 
 install-etc-files:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
@@ -96,31 +71,19 @@ install-etc-files:
 	done; \
 	for path in $$INSTALL_FILES; do \
 	  file=`basename $$path`; \
-	  echo "Installing $$file..."; \
-	  if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
-	    mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
-	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
-	    if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
-	      rm $(DESTDIR)$(etcdir)/$$file.prev; \
+	  if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
+	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+	      :; \
 	    else \
-	      echo; \
-	      echo "  Previous version of $$file saved as $$file.prev due\c";\
-	      echo   " to diffs."; \
-	      echo "  Please merge any local config changes into the new\c"; \
-	      echo   " $$file."; \
-	      echo; \
+	      $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+	      echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
 	    fi; \
 	  else \
 	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
 	  fi; \
 	done
 
-uninstall: uninstall-bin-files uninstall-etc-files
-
-uninstall-bin-files:
-	for script in $(GENERATED_BIN_FILES); do \
-	  rm -f $(DESTDIR)$(bindir)/$$script; \
-	done
+uninstall: uninstall-etc-files
 
 uninstall-etc-files:
 	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
@@ -133,7 +96,7 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f $(GENERATED_ETC_FILES) $(GENERATED_BIN_FILES)
+	rm -f $(GENERATED_ETC_FILES)
 
 distclean: clean
 	rm -f Makefile
@@ -148,11 +111,10 @@ subdir = etc
 
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
- 
+
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
 	@echo "Copying distribution files in $(subdir)"
 	@for file in $(DIST); do \
 	  cp -p $(srcdir)/$$file $(distdir); \
 	done
-