* Bug #15213, #18635: The use of the insecure m_scratch() and

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 66e42ad..cffd939 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -100,18 +100,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; \