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

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 0580723..0c7736d 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -14,9 +14,7 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-MTS         = @MTS@
 mailspool   = @mailspool@
-masquerade  = @masquerade@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -36,12 +34,12 @@ 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
@@ -70,10 +68,8 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(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),' < $(srcdir)/mts.conf.in > $@
+	$(SED) -e 's,%mailspool%,$(mailspool),' \
+	       -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@
 
 sendfiles: $(srcdir)/sendfiles.in Makefile
 	rm -f $@
@@ -95,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; \
@@ -141,11 +136,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
-