X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=etc%2FMakefile.in;h=1801d68618c0df816b20a31c23827de4b42e4ebe;hb=f88898638f4f0f8f6d77b1235b704982d295b832;hp=c2645cbe03e05e17434ac8f99147b78793ca0216;hpb=df7b16cb148474b3b80dbf1e226e858cf1e47edb;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index c2645cb..1801d68 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -97,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