Mercurial > octave-nkf

changeset 7075:1558d3dab722

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-26 18:22:04 by jwe]
author jwe
date Fri, 26 Oct 2007 18:22:05 +0000
parents 87151f298e6a
children 0bade2dc44a1
files ChangeLog Makeconf.in doc/ChangeLog doc/faq/Makefile.in doc/interpreter/Makefile.in doc/liboctave/Makefile.in
diffstat 6 files changed, 56 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 26 17:57:34 2007 +0000
+++ b/ChangeLog	Fri Oct 26 18:22:05 2007 +0000
@@ -1,3 +1,7 @@
+2007-10-26  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* Makeconf.in: Remove UNSETCOMSPEC trick.
+
 2007-10-25  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (AH_BOTTOM): Define OCTAVE_EMPTY_CPP_ARG here.
--- a/Makeconf.in	Fri Oct 26 17:57:34 2007 +0000
+++ b/Makeconf.in	Fri Oct 26 18:22:05 2007 +0000
@@ -75,14 +75,6 @@
 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@
--- a/doc/ChangeLog	Fri Oct 26 17:57:34 2007 +0000
+++ b/doc/ChangeLog	Fri Oct 26 18:22:05 2007 +0000
@@ -1,3 +1,10 @@
+2007-10-26  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* interpreter/Makefile.in, faq/Makefile.in, liboctave/Makefile.in:
+	Use temporary renamed files instead of Don't use --output option
+	argument for texi2[dvi|pdf].  Use $(sepchar) for path element
+	separation when building TEXINPUTS.  Remove use of UNSETCOMSPEC trick.
+
 2007-10-22  Kim Hansen  <kimhanse@gmail.com>
 
 	* interpreter/munge-texi.cc: Include <cstdlib> and <cstring>.
--- a/doc/faq/Makefile.in	Fri Oct 26 17:57:34 2007 +0000
+++ b/doc/faq/Makefile.in	Fri Oct 26 18:22:05 2007 +0000
@@ -54,14 +54,14 @@
 
 Octave-FAQ.dvi: $(TEXINFO)
 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2DVI) $<
+	  $(TEXI2DVI) $<
 
 Octave-FAQ.ps: Octave-FAQ.dvi
 	-dvips -o $@ $<
 
 Octave-FAQ.pdf: $(TEXINFO)
 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2PDF) $<
+	  $(TEXI2PDF) $<
 
 Octave-FAQ.html: $(TEXINFO)
 	-$(MAKEINFO) --html --ifinfo --no-split --output=$@ -I.. -I$(srcdir) -I$(srcdir)/.. $<
--- a/doc/interpreter/Makefile.in	Fri Oct 26 17:57:34 2007 +0000
+++ b/doc/interpreter/Makefile.in	Fri Oct 26 18:22:05 2007 +0000
@@ -111,11 +111,17 @@
 
 TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
 
-TEXI2DVICOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO) --output $@
+# 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.
 
-TEXI2PDFCOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2PDF) $(MAIN_TEXINFO) --output $@
+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]*
 
@@ -165,6 +171,12 @@
 	$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
 	@$(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 \
@@ -176,14 +188,14 @@
 	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO)
 
 octave.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
-	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO)
+	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
+	  $(TEXI2DVI) $(MAIN_TEXINFO)
 
-octave-a4.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES)
-	-$(TEXI2DVICOMMAND) -t @afourpaper
+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)
-	-$(TEXI2DVICOMMAND) -t @smallbook
+octave-smallbook.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES) octave-smallbook.texi
+	-$(TEXI2DVICOMMAND) octave-smallbook.texi -t @smallbook
 
 octave.ps: octave.dvi
 	-dvips -o $@ $<
@@ -195,13 +207,13 @@
 	-dvips -o $@ $<
 
 octave.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
-	-$(TEXI2PDFCOMMAND)
+	-$(TEXI2PDFCOMMAND) $(MAIN_TEXINFO)
 
-octave-a4.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES)
-	-$(TEXI2PDFCOMMAND) -t @afourpaper
+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)
-	-$(TEXI2PDFCOMMAND) -t @smallbook
+octave-smallbook.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) octave-smallbook.texi
+	-$(TEXI2PDFCOMMAND) octave-smallbook.texi -t @smallbook
 
 ../../INSTALL.OCTAVE: install.texi
 	rm -f INSTALL
@@ -318,7 +330,17 @@
 	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
+	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
@@ -332,7 +354,7 @@
 .PHONY: maintainer-clean
 
 clean-texi:
-	rm -f $(SUB_TEXINFO) contributors.texi
+	rm -f $(SUB_TEXINFO) contributors.texi octave-a4.texi octave-smallbook.texi
 .PHONY: clean-texi
 
 dist: clean-texi all
--- a/doc/liboctave/Makefile.in	Fri Oct 26 17:57:34 2007 +0000
+++ b/doc/liboctave/Makefile.in	Fri Oct 26 18:22:05 2007 +0000
@@ -66,15 +66,15 @@
 	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
 
 liboctave.dvi: $(TEXINFO)
-	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2DVI) $<
+	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
+	  $(TEXI2DVI) $<
 
 liboctave.ps: liboctave.dvi
 	-dvips -o $@ $<
 
 liboctave.pdf: $(TEXINFO)
-	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \
-	  $(UNSETCOMSPEC) $(TEXI2PDF) $<
+	-TEXINPUTS="..$(sepchar)$(srcdir)$(sepchar)$(srcdir)/..$(sepchar)$(TEXINPUTS)$(sepchar)" \
+	  $(TEXI2PDF) $<
 
 HTML/index.html: $(TEXINFO)
 	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $<