Remove RCS keywords, since they no longer work after git migration.

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 8fb3ea2..4bec6a1 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -23,6 +21,7 @@ smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
 # Path to search for programs to handle MIME
@@ -48,7 +47,9 @@ STATIC_FILES =  MailAliases components digestcomps distcomps forwcomps        \
 # templates and scripts from which non-static files are generated
 GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
 
-# scripts generated using above GENERATED_FILE_SRCs
+# 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
+# be stripped.
 GENERATED_BIN_FILES = sendfiles
 
 # non-scripts generated using above GENERATED_FILE_SRCs
@@ -85,7 +86,7 @@ install: install-bin-files install-etc-files
 install-bin-files:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        for script in $(GENERATED_BIN_FILES); do \
-         $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
+         $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
        done
 
 install-etc-files:
@@ -97,18 +98,12 @@ install-etc-files:
        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 \
+             echo "$(DESTDIR)$(etcdir)/$$file unchanged, skipped"; \
            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 "INFO: $(DESTDIR)$(etcdir)/$$file installed with .dist extension"; \
            fi; \
          else \
            $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \