Removed the last masquerading type: username_extension.

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 66e42ad..0c7736d 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -16,10 +14,7 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-MTS         = @MTS@
 mailspool   = @mailspool@
-masquerade  = @masquerade@
-smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -39,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
@@ -73,11 +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),' \
-              -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
+       $(SED) -e 's,%mailspool%,$(mailspool),' \
+              -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@
 
 sendfiles: $(srcdir)/sendfiles.in Makefile
        rm -f $@
@@ -99,19 +91,12 @@ 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; \
@@ -151,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
-