[svn] Fix installation of info files.

Published in <sxslmh6i9me.fsf@florida.arsdigita.de>.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 636643a90aa8ce161623de72df2fc95fa63ea30f..5a0bdc5915f5b2a2436ad2e485c06f94316f84a0 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-17  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * Makefile.in (install.info): If info files from the build
+       directory are not available, use the ones from $(srcdir).
+
 2001-11-16  Peter Farmer  <peter.farmer@zveno.com>
 
        * Makefile.in: Use $? instead of $<.  Use TEXI2POD more

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c5ef93bc0371b6aece72ef3f54672edaa875c6d7..c36aa2ee846e68a3e7df709d362ae54a64502a85 100644 (file)
--- 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)