From: Dan Harkless <dan@harkless.org>
Date: Fri, 21 Jul 2000 03:31:39 +0000 (+0000)
Subject: Fixed warnings from diff on first-time install of nmh.  Also added 'echo's
X-Git-Tag: RELEASE_1_2~215
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=f88898638f4f0f8f6d77b1235b704982d295b832;p=mmh

Fixed warnings from diff on first-time install of nmh.  Also added 'echo's
clarifying the etc file installation activities.
---

diff --git a/ChangeLog b/ChangeLog
index 971101e..98ec568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Thu Jul 20 19:30:23 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
+Thu Jul 20 20:30:52 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
 	* Moved Kimmo's new "--with-hash-backup" to be output with the
  	rest of the --with options in the configure --help output.  Also,
@@ -32,6 +32,9 @@ Thu Jul 20 19:30:23 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 	Modified inc.man to reflect that along with "pophost:" and -host, 
 	$MAILHOST can now activate POP mail inclusion as well.
 
+	* Fixed warnings from diff on first-time install of nmh.  Also
+	added 'echo's clarifying the etc file installation activities.
+
 Tue Jul 18 19:36:59 EDT 2000 Kimmo Suominen <kim@tac.nyc.ny.us>
 
 	* Added the answer to Dan's question in README.developers.
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