Index: liboctave/Makefile.in
===================================================================
RCS file: /cvs/octave/doc/liboctave/Makefile.in,v
retrieving revision 1.45
diff -c -p -r1.45 Makefile.in
*** liboctave/Makefile.in	12 Oct 2007 21:27:12 -0000	1.45
--- liboctave/Makefile.in	25 Oct 2007 10:42:09 -0000
*************** liboctave.info: $(TEXINFO)
*** 66,79 ****
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
  
  liboctave.dvi: $(TEXINFO)
! 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
  	  $(UNSETCOMSPEC) $(TEXI2DVI) $<
  
  liboctave.ps: liboctave.dvi
  	-dvips -o $@ $<
  
  liboctave.pdf: $(TEXINFO)
! 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
  	  $(UNSETCOMSPEC) $(TEXI2PDF) $<
  
  HTML/index.html: $(TEXINFO)
--- 66,79 ----
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
  
  liboctave.dvi: $(TEXINFO)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
  	  $(UNSETCOMSPEC) $(TEXI2DVI) $<
  
  liboctave.ps: liboctave.dvi
  	-dvips -o $@ $<
  
  liboctave.pdf: $(TEXINFO)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
  	  $(UNSETCOMSPEC) $(TEXI2PDF) $<
  
  HTML/index.html: $(TEXINFO)
Index: interpreter/Makefile.in
===================================================================
RCS file: /cvs/octave/doc/interpreter/Makefile.in,v
retrieving revision 1.160
diff -c -p -r1.160 Makefile.in
*** interpreter/Makefile.in	12 Oct 2007 21:27:12 -0000	1.160
--- interpreter/Makefile.in	25 Oct 2007 10:42:09 -0000
*************** TEXINFO_SOURCE := $(MAIN_TEXINFO) $(SUB_
*** 111,121 ****
  
  TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
  
! TEXI2DVICOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO) --output $@
  
! TEXI2PDFCOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(UNSETCOMSPEC) $(TEXI2PDF) $(MAIN_TEXINFO) --output $@
  
  FORMATTED = octave.info octave.pdf octave-a4.pdf octave.info-[0-9]*
  
--- 111,121 ----
  
  TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
  
! TEXI2DVICOMMAND = TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(UNSETCOMSPEC) $(TEXI2DVI)
  
! TEXI2PDFCOMMAND = TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(UNSETCOMSPEC) $(TEXI2PDF)
  
  FORMATTED = octave.info octave.pdf octave-a4.pdf octave.info-[0-9]*
  
*************** contributors.texi: contributors.in
*** 165,170 ****
--- 165,176 ----
  	$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > address@hidden
  	@$(simple-move-if-change-rule)
  
+ octave-a4.texi: $(MAIN_TEXINFO)
+ 	cp $< $@
+ 
+ octave-smallbook.texi: $(MAIN_TEXINFO)
+ 	cp $< $@
+ 
  $(SUB_TEXINFO) : %.texi : %.txi
  	@echo making $@ from $<
  	@./munge-texi \
*************** octave.info: $(IMAGES_TXT) $(TEXINFO) $(
*** 176,189 ****
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO)
  
  octave.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
! 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
  	  $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO)
  
! octave-a4.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2DVICOMMAND) -t @afourpaper
  
! octave-smallbook.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2DVICOMMAND) -t @smallbook
  
  octave.ps: octave.dvi
  	-dvips -o $@ $<
--- 182,195 ----
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO)
  
  octave.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
  	  $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO)
  
! octave-a4.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES) octave-a4.texi
! 	-$(TEXI2DVICOMMAND) octave-a4.texi -t @afourpaper
  
! octave-smallbook.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES) octave-smallbook.texi
! 	-$(TEXI2DVICOMMAND) octave-smallbook.texi -t @smallbook
  
  octave.ps: octave.dvi
  	-dvips -o $@ $<
*************** octave-smallbook.ps: octave-smallbook.dv
*** 195,207 ****
  	-dvips -o $@ $<
  
  octave.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2PDFCOMMAND)
  
! octave-a4.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2PDFCOMMAND) -t @afourpaper
  
! octave-smallbook.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2PDFCOMMAND) -t @smallbook
  
  ../../INSTALL.OCTAVE: install.texi
  	rm -f INSTALL
--- 201,213 ----
  	-dvips -o $@ $<
  
  octave.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
! 	-$(TEXI2PDFCOMMAND) $(MAIN_TEXINFO)
  
! octave-a4.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) octave-a4.texi
! 	-$(TEXI2PDFCOMMAND) octave-a4.texi -t @afourpaper
  
! octave-smallbook.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) octave-smallbook.texi
! 	-$(TEXI2PDFCOMMAND) octave-smallbook.texi -t @smallbook
  
  ../../INSTALL.OCTAVE: install.texi
  	rm -f INSTALL
*************** maintainer-clean: clean clean-texi
*** 332,338 ****
  .PHONY: maintainer-clean
  
  clean-texi:
! 	rm -f $(SUB_TEXINFO) contributors.texi
  .PHONY: clean-texi
  
  dist: clean-texi all
--- 338,344 ----
  .PHONY: maintainer-clean
  
  clean-texi:
! 	rm -f $(SUB_TEXINFO) contributors.texi octave-a4.texi octave-smallbook.texi
  .PHONY: clean-texi
  
  dist: clean-texi all