]> sjero.net Git - wget/commitdiff
[svn] Makefile (install.wgetrc): I completely missed the message that the new wgetrc
authordan <devnull@localhost>
Thu, 13 Apr 2000 04:37:51 +0000 (21:37 -0700)
committerdan <devnull@localhost>
Thu, 13 Apr 2000 04:37:51 +0000 (21:37 -0700)
wasn't being installed the first couple of times I ran `make install' after
changing sample.wgetrc.  Added blank lines around the message and a "<Hit RETURN
to acknowledge>", and reworded the message to be a bit more clear.

doc/ChangeLog
doc/Makefile.in

index e36069438d921c4ddb6f2eb23dc15159176ff752..543deee642bf042e0e059908f5c6ce918355bae9 100644 (file)
@@ -1,5 +1,11 @@
 2000-04-12  Dan Harkless  <dan-wget@dilvish.speed.net>
 
+       * Makefile (install.wgetrc): I completely missed the message that
+       the new wgetrc wasn't being installed the first couple of times I
+       ran `make install' after changing sample.wgetrc.  Added blank
+       lines around the message and a "<Hit RETURN to acknowledge>", and
+       reworded the message to be a bit more clear.
+       
        * sample.wgetrc: Added entries for backup_converted and waitretry.
 
        * wget.texi (waitretry): Herold Heiko <Heiko.Herold@previnet.it>'s
index 9f4fc5d060631a251bbc0ecda7bf29771a89bda9..a392f915b9616f3b813465cd374648f90a909fbd 100644 (file)
@@ -105,9 +105,13 @@ install.wgetrc:
             else \
             echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \
             $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \
-            echo "WARNING: File \`$(WGETRC)' already exists and is spared."; \
-            echo "         You might want to consider \`$(WGETRC).new',"; \
-            echo "         and merge both into \`$(WGETRC)', for the best."; \
+            echo; \
+            echo "WARNING: Differing \`$(WGETRC)' already exists and"; \
+            echo "         has been spared.  You might want to consider"; \
+            echo "         merging in the new lines from \`$(WGETRC).new'."; \
+            echo; \
+            echo "<Hit RETURN to acknowledge>\c"; \
+            read user_input; \
          fi; \
        else \
          $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \