Removed mts.conf; the maildelivery option went into slocal directly.

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 721cacb..5de4e41 100644 (file)
--- 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@
@@ -43,7 +42,7 @@ STATIC_FILES = components digestcomps distcomps forwcomps  \
                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
+GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh sendfiles.in
 
 # scripts generated using above GENERATED_FILE_SRCs; don't add binaries
 # to this list, as they'll get installed with INSTALL_SCRIPT and won't
@@ -51,7 +50,7 @@ GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
 GENERATED_BIN_FILES = sendfiles
 
 # 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
@@ -67,12 +66,6 @@ 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,%mailspool%,$(mailspool),' \
-              -e 's,%etcdir%,$(etcdir),' \
-              -e 's,%masquerade%,$(masquerade),' < $(srcdir)/mts.conf.in > $@
-
 sendfiles: $(srcdir)/sendfiles.in Makefile
        rm -f $@
        $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
@@ -93,13 +86,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; \