From 468778c89516c180d2cca095d6c7059bb4b16604 Mon Sep 17 00:00:00 2001 From: hniksic Date: Fri, 15 Jun 2001 11:36:31 -0700 Subject: [PATCH] [svn] Make `make install' non-interactive. Published in <20010611201545.A9740@adam.yggdrasil.com>. --- doc/ChangeLog | 10 ++++++++++ doc/Makefile.in | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9c05c552..3a2c41c2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2001-06-15 Hrvoje Niksic + + * Makefile.in (install.wgetrc): Use $(DESTDIR) when testing + whether $(WGETRC) exists. + +2001-06-15 Adam J. Richter + + * Makefile.in (install.wgetrc): Make `make install' + non-interactive in all cases. + 2001-06-15 Hrvoje Niksic * Makefile.in (install.wgetrc): Take $(DESTDIR) into account when diff --git a/doc/Makefile.in b/doc/Makefile.in index 7ee5a9b7..b29b3351 100644 --- 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 "\c"; \ - read user_input; \ - echo; \ fi; \ else \ $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \