[svn] Applied Keith Moore's patch to fix a harmless (but annoying) documentation...

[wget] / doc / Makefile.in

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7ee5a9b7df76be11d4c5a352e97d7a606f2da2a2..d6db64a699e64822bb71df1af06e89c4a57cf6c9 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -48,7 +48,7 @@ INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 RM = rm -f
 
-TEXI2POD     = ./texi2pod.pl
+TEXI2POD     = texi2pod.pl
 POD2MAN      = @POD2MAN@
 MAN          = wget.$(manext)
 WGETRC       = $(sysconfdir)/wgetrc
@@ -63,23 +63,23 @@ all: wget.info @COMMENT_IF_NO_POD2MAN@$(MAN)
 everything: all wget_us.ps wget_a4.ps wget_toc.html
 
 $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
-       sed s/@/@@/g $< > $@
+       sed s/@/@@/g $? > $@
 
-wget.info: $(SAMPLERCTEXI) $(srcdir)/wget.texi
-       $(MAKEINFO) -I$(srcdir)
+wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
+       $(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
 
 $(TEXI2POD): $(srcdir)/$(TEXI2POD).in
-       sed s,/usr/bin/perl,@PERL@, $< > $@
+       sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@
        chmod u+x $@
 
-wget.pod: $(srcdir)/wget.texi texi2pod.pl
-       $(TEXI2POD) $< $@
+wget.pod: $(srcdir)/wget.texi $(TEXI2POD) $(srcdir)/version.texi
+       ./$(TEXI2POD) $(srcdir)/wget.texi $@
 
 $(MAN): wget.pod
-       $(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $< > $@
+       $(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@
 
 #wget.cat: $(MAN)
-#      nroff -man $< > $@
+#      nroff -man $? > $@
 
 dvi: wget.dvi
 
@@ -106,11 +106,23 @@ 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 \
+            if test -f "$$file"; then \
+             $(INSTALL_DATA) "$$file" "$(DESTDIR)$(infodir)/$$file" ; \
+           fi; \
+         done; \
+       else \
+         for file in $(srcdir)/wget.info $(srcdir)/wget.info-*[0-9]; do \
+            if test -f "$$file"; then \
+             $(INSTALL_DATA) "$$file" "$(DESTDIR)$(infodir)/`basename $$file`" ; \
+           fi; \
+         done; \
+       fi
 
 # install man page, creating install directory if necessary
 install.man: $(MAN)
@@ -120,7 +132,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 +143,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); \