Fixed warnings from diff on first-time install of nmh. Also added 'echo's

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index ebd93d3..1801d68 100644 (file)
--- 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@
@@ -75,7 +76,8 @@ 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 > $@
@@ -95,13 +97,22 @@ install-bin-files:
 install-etc-files:
        $(top_srcdir)/mkinstalldirs $(etcdir)
        for file in $(INSTALL_ETC_FILES); do \
-         echo $$file; \
+         echo "Installing $$file..."; \
          if [ -f $(etcdir)/$$file ]; then \
            mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-         if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-           rm $(etcdir)/$$file.prev; \
+           $(INSTALL_DATA) $(srcdir)/$$file $(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) $(srcdir)/$$file $(etcdir)/$$file; \
          fi; \
        done