X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=cffd9399754b9599855677b6e785ba0c877ea12e;hp=66e42ada56533c7cd41c2df20bec12c19cfb0099;hb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;hpb=352fe458a57061db81240c19fa4b356c7448463b;ds=sidebyside

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 66e42ad..cffd939 100644
--- 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; \