X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=0c7736d646151179600dbdf37f4fb9d4573ca6cd;hp=c3265770115a6832d8d7345c4890812207e69818;hb=2abae0bfd0ad5bf898461e50aa4b466d641f23d9;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/etc/Makefile.in b/etc/Makefile.in
index c326577..0c7736d 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -15,7 +15,6 @@ libdir      = @libdir@
 etcdir      = @sysconfdir@
 
 mailspool   = @mailspool@
-masquerade  = @masquerade@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -35,11 +34,11 @@ SED = sed
 .SUFFIXES:
 
 # static configuration, format, and components files
-STATIC_FILES = MailAliases components digestcomps distcomps forwcomps  \
+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.default scan.mailx scan.nomime scan.size scan.time \
+               scan.nmh scan.mailx scan.nomime scan.size scan.time \
                scan.timely scan.unseen
 
 # templates and scripts from which non-static files are generated
@@ -70,8 +69,7 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 mts.conf: $(srcdir)/mts.conf.in Makefile
 	rm -f $@
 	$(SED) -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(etcdir),' \
-	       -e 's,%masquerade%,$(masquerade),' < $(srcdir)/mts.conf.in > $@
+	       -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@
 
 sendfiles: $(srcdir)/sendfiles.in Makefile
 	rm -f $@
@@ -93,13 +91,12 @@ install-etc-files:
 	done; \
 	for path in $$INSTALL_FILES; do \
 	  file=`basename $$path`; \
-	  echo "Installing $$file..."; \
 	  if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
-	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file"; then \
-	      echo "$(DESTDIR)$(etcdir)/$$file unchanged, skipped"; \
+	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+	      :; \
 	    else \
 	      $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
-	      echo "INFO: $(DESTDIR)$(etcdir)/$$file installed with .dist extension"; \
+	      echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
 	    fi; \
 	  else \
 	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \