X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=d50fcf78864e40f88c9d1a78a771897be2163a85;hp=42f38e63697e38bc2d2e3840dcf090ffbe7bcfac;hb=ec751d9bbebd843215896b299712728eed0ea76c;hpb=7593f8f93951b6ca853a72bdbcd0a34dc741bc52

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 42f38e6..d50fcf7 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -16,6 +16,7 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
+MTS         = @MTS@
 mailspool   = @mailspool@
 masquerade  = @masquerade@
 smtpservers = @smtpservers@
@@ -36,31 +37,32 @@ SED = sed
 
 .SUFFIXES:
 
-# format and components files
-DIST_FILES = mhl.body mhl.digest mhl.format mhl.forward mhl.headers \
-             mhl.reply scan.default scan.mailx scan.nomime scan.size scan.time \
-             scan.timely scan.unseen components digestcomps distcomps \
-             forwcomps rcvdistcomps rcvdistcomps.outbox replcomps \
-	     replgroupcomps MailAliases
+# 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
 
-# format and configuration files to generate
-GEN_FILES = mhn.defaults mts.conf
+# templates and scripts from which non-static files are generated
+GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
 
-# data files we need to install
-FILES = $(DIST_FILES) $(GEN_FILES)
+# scripts generated using above GENERATED_FILE_SRCs
+GENERATED_BIN_FILES = sendfiles
 
-# scripts to install
-SCRIPTS = sendfiles
+# non-scripts generated using above GENERATED_FILE_SRCs
+GENERATED_ETC_FILES = mhn.defaults mts.conf
 
-# auxiliary files
-AUX = Makefile.in mhn.defaults.sh mhn.find.sh mts.conf.in
+# auxiliary files (included in distribution but not installed)
+AUX = Makefile.in
 
-# all files in this directory included in the distribution
-DIST = $(DIST_FILES) $(SCRIPTS) $(AUX)
+# all non-generated files in this directory are included in the distribution
+DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GEN_FILES)
+all: $(GENERATED_BIN_FILES) $(GENERATED_ETC_FILES)
 
 mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
@@ -68,44 +70,61 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 
 mts.conf: $(srcdir)/mts.conf.in Makefile
 	rm -f $@
-	$(SED) -e 's,%mailspool%,$(mailspool),' \
+	$(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 > $@
 
-install: install-files install-scripts
+sendfiles: $(srcdir)/sendfiles.in Makefile
+	rm -f $@
+	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
 
-install-files:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
-	for file in $(DIST_FILES); do \
-	  if [ -f $(etcdir)/$$file ]; then \
-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
+install: install-bin-files install-etc-files
+
+install-bin-files:
+	$(top_srcdir)/mkinstalldirs $(bindir)
+	for script in $(GENERATED_BIN_FILES); do \
+	  $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
 	done
-	for file in $(GEN_FILES); do \
+
+install-etc-files:
+	$(top_srcdir)/mkinstalldirs $(etcdir)
+	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+	for file in $(STATIC_FILES); do \
+	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+	done; \
+	for path in $$INSTALL_FILES; do \
+	  file=`basename $$path`; \
+	  echo "Installing $$file..."; \
 	  if [ -f $(etcdir)/$$file ]; then \
-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
+	    mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
+	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
+	    if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
+	      rm $(etcdir)/$$file.prev; \
+	    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; \
+	    fi; \
+	  else \
+	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
 	  fi; \
-	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
 	done
 
-install-scripts:
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	for script in $(SCRIPTS); do \
-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-	done
+uninstall: uninstall-bin-files uninstall-etc-files
 
-uninstall: uninstall-files uninstall-scripts
-
-uninstall-files:
-	for file in $(FILES); do \
-	  rm -f $(etcdir)/$$file; \
+uninstall-bin-files:
+	for script in $(GENERATED_BIN_FILES); do \
+	  rm -f $(bindir)/$$script; \
 	done
 
-uninstall-scripts:
-	for script in $(SCRIPTS); do \
-	  rm -f $(bindir)/$$script; \
+uninstall-etc-files:
+	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+	  rm -f $(etcdir)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -114,7 +133,7 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f $(GEN_FILES)
+	rm -f $(GENERATED_ETC_FILES) $(GENERATED_BIN_FILES)
 
 distclean: clean
 	rm -f Makefile