[svn] Make `make install' non-interactive.

Published in <20010611201545.A9740@adam.yggdrasil.com>.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9c05c552509968adbce3960628360d6086f6f4a9..3a2c41c2b12e60695567491a965b88c5e1f03548 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-15  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * Makefile.in (install.wgetrc): Use $(DESTDIR) when testing
+       whether $(WGETRC) exists.
+
+2001-06-15  Adam J. Richter  <adam@yggdrasil.com>
+
+       * Makefile.in (install.wgetrc): Make `make install'
+       non-interactive in all cases.
+
 2001-06-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * Makefile.in (install.wgetrc): Take $(DESTDIR) into account when

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7ee5a9b7df76be11d4c5a352e97d7a606f2da2a2..b29b3351f437e3eb41ff354ac99a9d42ec6c347c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -120,7 +120,7 @@ install.man: $(MAN)
 # install sample.wgetrc
 install.wgetrc: $(srcdir)/sample.wgetrc
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-       @if test -f $(WGETRC); then \
+       @if test -f $(DESTDIR)$(WGETRC); then \
          if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
             else \
             echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new'; \
@@ -131,9 +131,6 @@ install.wgetrc: $(srcdir)/sample.wgetrc
             echo "         consider merging in the new lines from"; \
             echo "         \`$(DESTDIR)$(WGETRC).new'."; \
             echo; \
-            echo "<Hit RETURN to acknowledge>\c"; \
-            read user_input; \
-            echo; \
          fi; \
        else \
          $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \