mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
[svn] Make `make install' non-interactive.
Published in <20010611201545.A9740@adam.yggdrasil.com>.
This commit is contained in:
parent
9b7f6ff41d
commit
468778c895
@ -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>
|
2001-06-15 Hrvoje Niksic <hniksic@arsdigita.com>
|
||||||
|
|
||||||
* Makefile.in (install.wgetrc): Take $(DESTDIR) into account when
|
* Makefile.in (install.wgetrc): Take $(DESTDIR) into account when
|
||||||
|
@ -120,7 +120,7 @@ install.man: $(MAN)
|
|||||||
# install sample.wgetrc
|
# install sample.wgetrc
|
||||||
install.wgetrc: $(srcdir)/sample.wgetrc
|
install.wgetrc: $(srcdir)/sample.wgetrc
|
||||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
|
$(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 ""; \
|
if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
|
||||||
else \
|
else \
|
||||||
echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new'; \
|
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 " consider merging in the new lines from"; \
|
||||||
echo " \`$(DESTDIR)$(WGETRC).new'."; \
|
echo " \`$(DESTDIR)$(WGETRC).new'."; \
|
||||||
echo; \
|
echo; \
|
||||||
echo "<Hit RETURN to acknowledge>\c"; \
|
|
||||||
read user_input; \
|
|
||||||
echo; \
|
|
||||||
fi; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
$(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
|
$(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
|
||||||
|
Loading…
Reference in New Issue
Block a user