Fix building of rw-FAQ (amends 85606, with Kurt Hornik).

git-svn-id: https://svn.r-project.org/R/trunk@85813 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: kalibera

doc/manual/Makefile.in

@@ -464,20 +464,20 @@ RVER = `cut -d' ' -f1 $(top_srcdir)/VERSION | $(SED) -n 1p`
 RPREFIX = `../../bin$(R_ARCH)/Rscript $(top_srcdir)/src/gnuwin32/fixed/rwver.R`
 SEDVER = -e s/@RVER@/$(RVER)/g -e s/@RWVER@/$(RPREFIX)/g
 
-rw-FAQ.html: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/Rman.css
+rw-FAQ.html: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/Rman.css $(srcdir)/R-defs.texi
 	@echo "making rw-FAQ.html"
 	@$(SED) $(SEDVER) $< > tmp_html.texi
-	@$(TEXI2ANY) --no-split --html --no-headers --number-sections --css-include=$(srcdir)/Rman.css -o $@ tmp_html.texi
+	@$(TEXI2ANY) -I$(srcdir) --no-split --html --no-headers --number-sections --css-include=$(srcdir)/Rman.css -o $@ tmp_html.texi
 	@rm -f tmp_html.texi
 
-rw-FAQ: rw-FAQ.texi $(top_srcdir)/VERSION
+rw-FAQ: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/R-defs.texi
 	@echo "making rw-FAQ"
 	@$(SED) $(SEDVER) $< > tmp_plain.texi
-	@$(TEXI2ANY) --no-headers --number-sections -o $@ tmp_plain.texi
+	@$(TEXI2ANY) -I$(srcdir) --no-headers --number-sections -o $@ tmp_plain.texi
 	@rm -f tmp_plain.texi
 
-rw-FAQ.pdf: rw-FAQ.texi $(top_srcdir)/VERSION
+rw-FAQ.pdf: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/R-defs.texi
 	@$(SED) $(SEDVER) $< > tmp_pdf.texi
-	@$(TEXI2PDF) tmp_pdf.texi
+	@TEXINPUTS="$(srcdir):$$TEXINPUTS" $(TEXI2PDF) tmp_pdf.texi
 	@mv tmp_pdf.pdf $@
 	@rm tmp_pdf.*

doc/manual/Makefile.win

@@ -213,16 +213,16 @@ SEDVER = -e s/@RVER@/$(RVER)/g -e s/@RWVER@/$(RPREFIX)/g
 FAQ: rw-FAQ ../html/rw-FAQ.html
 
 ifneq "$(TEXI2ANY)" "missing"
-../html/rw-FAQ.html: rw-FAQ.texi $(top_srcdir)/VERSION Rman.css
+../html/rw-FAQ.html: rw-FAQ.texi $(top_srcdir)/VERSION Rman.css $(srcdir)/R-defs.texi
 	@echo "making rw-FAQ.html"
 	@$(SED) $(SEDVER) $< > tmp_html.texi
-	@$(TEXI2ANY) --no-split --html --no-headers --number-sections --css-include=Rman.css -o $@ tmp_html.texi
+	@$(TEXI2ANY) -I$(srcdir) --no-split --html --no-headers --number-sections --css-include=Rman.css -o $@ tmp_html.texi
 	@rm -f tmp_html.texi
 
-rw-FAQ: rw-FAQ.texi $(top_srcdir)/VERSION
+rw-FAQ: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/R-defs.texi
 	@echo "making rw-FAQ"
 	@$(SED) $(SEDVER) $< > tmp_plain.texi
-	@$(TEXI2ANY) --no-headers --number-sections -o $@ tmp_plain.texi
+	@$(TEXI2ANY) -I$(srcdir) --no-headers --number-sections -o $@ tmp_plain.texi
 	@rm -f tmp_plain.texi
 else
 ../html/rw-FAQ.html: rw-FAQ.texi $(top_srcdir)/VERSION Rman.css
@@ -232,7 +232,7 @@ rw-FAQ: rw-FAQ.texi $(top_srcdir)/VERSION
 	@$(ECHO) "texi2any is not available"
 endif
 
-rw-FAQ.pdf: rw-FAQ.texi $(top_srcdir)/VERSION
+rw-FAQ.pdf: rw-FAQ.texi $(top_srcdir)/VERSION $(srcdir)/R-defs.texi
 	@$(SED) $(SEDVER) $< > tmp_pdf.texi
 	@$(TEXI2DVI) --pdf tmp_pdf.texi
 	@$(TEXI2DVI) --pdf tmp_pdf.texi

doc/manual/rw-FAQ.texi

@@ -11,6 +11,8 @@
 
 @finalout
 
+@include R-defs.texi
+
 @macro newchap{}
 @ifinfo
 @sp 1