From 4f5a898a660d2a219dc368c73a17e572f9c1013a Mon Sep 17 00:00:00 2001 From: hniksic Date: Fri, 16 Nov 2001 15:23:22 -0800 Subject: [PATCH] [svn] Fix installation of info files. Published in . --- doc/ChangeLog | 5 +++++ doc/Makefile.in | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 636643a9..5a0bdc59 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2001-11-17 Hrvoje Niksic + + * Makefile.in (install.info): If info files from the build + directory are not available, use the ones from $(srcdir). + 2001-11-16 Peter Farmer * Makefile.in: Use $? instead of $<. Use TEXI2POD more diff --git a/doc/Makefile.in b/doc/Makefile.in index c5ef93bc..c36aa2ee 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -106,11 +106,19 @@ install: install.info install.wgetrc @COMMENT_IF_NO_POD2MAN@install.man uninstall: uninstall.info @COMMENT_IF_NO_POD2MAN@uninstall.man # install info pages, creating install directory if necessary +# if the info pages are built in the build directory, they are used. +# otherwise, the ones from the distribution are installed. install.info: wget.info $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) - -for file in wget.info wget.info-*[0-9]; do \ - test -f $$file && $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file ; \ - done + -if test -f wget.info; then \ + for file in wget.info wget.info-*[0-9]; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file ; \ + done; \ + else \ + for file in $(srcdir)/wget.info $(srcdir)/wget.info-*[0-9]; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/`basename $$file` ; \ + done; \ + fi # install man page, creating install directory if necessary install.man: $(MAN)