X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=doc%2FMakefile.in;h=57ff2f578a54df76da2c9a221b629af6c5a28853;hb=19f0a05e9135c570b871804b7b88724e9746c005;hp=803933168f1d2927f0f3612d575c73bb1b4b51d7;hpb=d41af5f52ee17aa421a07883d50600f623d4c0e5;p=wget

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 80393316..57ff2f57 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -3,7 +3,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #
 # Version: @VERSION@
@@ -30,6 +29,8 @@ DVIPS = dvips -D 300
 # Program to convert texinfo files to html
 TEXI2HTML = texi2html -expandinfo -split_chapter
 
+top_builddir = ..
+
 top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
@@ -40,13 +41,13 @@ mandir     = @mandir@
 manext     = 1
 sysconfdir = @sysconfdir@
 
-top_builddir = ..
+DESTDIR    =
 
 INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 RM = rm -f
 
-TEXI2POD     = ./texi2pod.pl
+TEXI2POD     = $(srcdir)/texi2pod.pl
 POD2MAN      = @POD2MAN@
 MAN          = wget.$(manext)
 WGETRC       = $(sysconfdir)/wgetrc
@@ -61,23 +62,19 @@ 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 $< > $@
-
-wget.info: $(SAMPLERCTEXI) $(srcdir)/wget.texi
-	-$(MAKEINFO)
+	sed s/@/@@/g $? > $@
 
-$(TEXI2POD): $(srcdir)/$(TEXI2POD).in
-	sed s,/usr/bin/perl,@PERL@, $< > $@
-	chmod u+x $@
+wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
 
-wget.pod: $(srcdir)/wget.texi texi2pod.pl
-	$(TEXI2POD) $< $@
+wget.pod: $(srcdir)/wget.texi $(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
 
@@ -104,46 +101,55 @@ 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 $(infodir)
-	-for file in wget.info wget.info-*[0-9]; do \
-	   test -f $$file && $(INSTALL_DATA) $$file $(infodir)/$$file ; \
-	done
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+	-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)
-	$(top_srcdir)/mkinstalldirs $(mandir)/man$(manext)
-	$(INSTALL_DATA) $(srcdir)/$(MAN) $(mandir)/man$(manext)/$(MAN)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext)
+	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)
 
 # install sample.wgetrc
 install.wgetrc: $(srcdir)/sample.wgetrc
-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
-	@if test -f $(WGETRC); then \
-	  if cmp -s $(srcdir)/sample.wgetrc $(WGETRC); then echo ""; \
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+	@if test -f $(DESTDIR)$(WGETRC); then \
+	  if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
 	     else \
-	     echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \
-	     $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \
+	     echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new'; \
+	     $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new; \
 	     echo; \
-	     echo "WARNING: Differing \`$(WGETRC)'"; \
+	     echo "WARNING: Differing \`$(DESTDIR)$(WGETRC)'"; \
 	     echo "         exists and has been spared.  You might want to"; \
 	     echo "         consider merging in the new lines from"; \
-	     echo "         \`$(WGETRC).new'."; \
-	     echo; \
-	     echo "<Hit RETURN to acknowledge>\c"; \
-	     read user_input; \
+	     echo "         \`$(DESTDIR)$(WGETRC).new'."; \
 	     echo; \
 	  fi; \
 	else \
-	  $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \
+	  $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
 	fi
 
 # uninstall info pages
 uninstall.info:
-	$(RM) $(infodir)/wget.info*
+	$(RM) $(DESTDIR)$(infodir)/wget.info*
 
 # uninstall man page
 uninstall.man:
-	$(RM) $(mandir)/man$(manext)/$(MAN)
+	$(RM) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)
 
 #
 # Dependencies for cleanup
@@ -155,7 +161,7 @@ clean:
 
 distclean: clean
 	$(RM) Makefile
-	$(RM) $(MAN) $(TEXI2POD)
+	$(RM) $(MAN)
 
 realclean: distclean
 	$(RM) wget.info*