Index: Makeconf.in
===================================================================
RCS file: /cvs/octave/Makeconf.in,v
retrieving revision 1.200
diff -c -p -r1.200 Makeconf.in
*** Makeconf.in	24 Oct 2007 20:35:20 -0000	1.200
--- Makeconf.in	26 Oct 2007 11:49:08 -0000
*************** MAKEINFO = @MAKEINFO@
*** 75,88 ****
  TEXI2DVI = @TEXI2DVI@
  TEXI2PDF = @TEXI2PDF@
  
- # Both texi2dvi and texi2pdf check COMSPEC to decide what path
- # separator to use.  We build Octave with a Unixy shell, even on
- # Windows sytems, so we need to unset COMSPEC when invoking these
- # scripts.  Used in the doc/*/Makefiles.
- ifneq ($(COMSPEC),)
-   UNSETCOMSPEC = COMSPEC=
- endif
- 
  GHOSTSCRIPT = @GHOSTSCRIPT@
  
  DEFAULT_PAGER = @DEFAULT_PAGER@
--- 75,80 ----
Index: doc/faq/Makefile.in
===================================================================
RCS file: /cvs/octave/doc/faq/Makefile.in,v
retrieving revision 1.39
diff -c -p -r1.39 Makefile.in
*** doc/faq/Makefile.in	12 Oct 2007 21:27:12 -0000	1.39
--- doc/faq/Makefile.in	26 Oct 2007 11:49:08 -0000
*************** Octave-FAQ.info: $(TEXINFO)
*** 54,67 ****
  
  Octave-FAQ.dvi: $(TEXINFO)
  	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(UNSETCOMSPEC) $(TEXI2DVI) $<
  
  Octave-FAQ.ps: Octave-FAQ.dvi
  	-dvips -o $@ $<
  
  Octave-FAQ.pdf: $(TEXINFO)
  	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(UNSETCOMSPEC) $(TEXI2PDF) $<
  
  Octave-FAQ.html: $(TEXINFO)
  	-$(MAKEINFO) --html --ifinfo --no-split --output=$@ -I.. -I$(srcdir) -I$(srcdir)/.. $<
--- 54,67 ----
  
  Octave-FAQ.dvi: $(TEXINFO)
  	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(TEXI2DVI) $<
  
  Octave-FAQ.ps: Octave-FAQ.dvi
  	-dvips -o $@ $<
  
  Octave-FAQ.pdf: $(TEXINFO)
  	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
! 	  $(TEXI2PDF) $<
  
  Octave-FAQ.html: $(TEXINFO)
  	-$(MAKEINFO) --html --ifinfo --no-split --output=$@ -I.. -I$(srcdir) -I$(srcdir)/.. $<
Index: doc/interpreter/Makefile.in
===================================================================
RCS file: /cvs/octave/doc/interpreter/Makefile.in,v
retrieving revision 1.160
diff -c -p -r1.160 Makefile.in
*** doc/interpreter/Makefile.in	12 Oct 2007 21:27:12 -0000	1.160
--- doc/interpreter/Makefile.in	26 Oct 2007 11:49:08 -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,127 ----
  
  TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
  
! # Do not use --output option argument, because this is not
! # supported by MiKTeX (compilation under Windows/MSVC assumes
! # the use of MiKTeX to build the doc). Instead, copy the
! # source .texi using the targeted file name (e.g. to generate
! # octave-a4.pdf, copy to octave-a4.texi) and call texi2[dvi|pdf]
! # on it.
! TEXI2DVICOMMAND = TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(TEXI2DVI)
  
! TEXI2PDFCOMMAND = TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(TEXI2PDF)
  
  FORMATTED = octave.info octave.pdf octave-a4.pdf octave.info-[0-9]*
  
*************** contributors.texi: contributors.in
*** 165,170 ****
--- 171,182 ----
  	$(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 $@ $<
--- 188,201 ----
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO)
  
  octave.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(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
--- 207,219 ----
  	-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
*************** mostlyclean clean:
*** 318,324 ****
  	octave.cps octave.fns octave.ins octave.kys octave.ops \
  	octave.pgs octave.rds octave.tps octave.vrs octave.aux \
  	octave.log octave.toc \
! 	munge-texi$(BUILD_EXEEXT) munge-texi.o
  .PHONY: mostlyclean clean 
  
  distclean: clean
--- 330,346 ----
  	octave.cps octave.fns octave.ins octave.kys octave.ops \
  	octave.pgs octave.rds octave.tps octave.vrs octave.aux \
  	octave.log octave.toc \
! 	munge-texi$(BUILD_EXEEXT) munge-texi.o \
! 	octave-a4.cp octave-a4.fn octave-a4.in \
! 	octave-a4.ky octave-a4.op octave-a4.pg octave-a4.rd octave-a4.tp octave-a4.vr \
! 	octave-a4.cps octave-a4.fns octave-a4.ins octave-a4.kys octave-a4.ops \
! 	octave-a4.pgs octave-a4.rds octave-a4.tps octave-a4.vrs octave-a4.aux \
! 	octave-a4.log octave-a4.toc \
! 	octave-smallbook.cp octave-smallbook.fn octave-smallbook.in \
! 	octave-smallbook.ky octave-smallbook.op octave-smallbook.pg octave-smallbook.rd octave-smallbook.tp octave-smallbook.vr \
! 	octave-smallbook.cps octave-smallbook.fns octave-smallbook.ins octave-smallbook.kys octave-smallbook.ops \
! 	octave-smallbook.pgs octave-smallbook.rds octave-smallbook.tps octave-smallbook.vrs octave-smallbook.aux \
! 	octave-smallbook.log octave-smallbook.toc
  .PHONY: mostlyclean clean 
  
  distclean: clean
*************** 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
--- 354,360 ----
  .PHONY: maintainer-clean
  
  clean-texi:
! 	rm -f $(SUB_TEXINFO) contributors.texi octave-a4.texi octave-smallbook.texi
  .PHONY: clean-texi
  
  dist: clean-texi all
Index: doc/liboctave/Makefile.in
===================================================================
RCS file: /cvs/octave/doc/liboctave/Makefile.in,v
retrieving revision 1.45
diff -c -p -r1.45 Makefile.in
*** doc/liboctave/Makefile.in	12 Oct 2007 21:27:12 -0000	1.45
--- doc/liboctave/Makefile.in	26 Oct 2007 11:49:08 -0000
*************** liboctave.info: $(TEXINFO)
*** 66,80 ****
  	-$(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)
  	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $<
--- 66,80 ----
  	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
  
  liboctave.dvi: $(TEXINFO)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(TEXI2DVI) $<
  
  liboctave.ps: liboctave.dvi
  	-dvips -o $@ $<
  
  liboctave.pdf: $(TEXINFO)
! 	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
! 	  $(TEXI2PDF) $<
  
  HTML/index.html: $(TEXINFO)
  	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $<