From 441b674f963aaa7f41692263cc37da15dc5f2d92 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 3 Apr 2008 23:03:25 -0700 Subject: [PATCH] workaround texinfo problem with non-local images --- doc/tutorial/Makefile | 12 +++++++----- doc/tutorial/helpers.texi | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile index 15da98f56..4e309de56 100644 --- a/doc/tutorial/Makefile +++ b/doc/tutorial/Makefile @@ -6,15 +6,17 @@ CONVERT = convert CSS = --css-include=tutorial.css SPLIT = --split section -TGIF_SOURCES = helpers.obj +TGIF_SOURCES = helpers.obj helpers2.obj TGIF_EPS = ${TGIF_SOURCES:.obj=.eps} +TGIF_PNG = ${TGIF_SOURCES:.obj=.eps} all: images html split-html pdf images: - cd figures/; $(TGIF) -print -eps $(TGIF_SOURCES) - cd figures/; $(foreach FILE,$(TGIF_EPS),$(CONVERT) $(FILE) ${FILE:.eps=.png};) - cd figures/; $(foreach FILE,$(TGIF_EPS),$(EPSTOPDF) $(FILE);) + cd figures/; cp $(TGIF_SOURCES) ../ + $(TGIF) -print -eps $(TGIF_SOURCES) + $(foreach FILE,$(TGIF_EPS),$(CONVERT) $(FILE) ${FILE:.eps=.png};) + $(foreach FILE,$(TGIF_EPS),$(EPSTOPDF) $(FILE);) html: images $(TEXI2HTML) ${CSS} tutorial.texi @@ -26,4 +28,4 @@ pdf: images $(TEXI2PDF) tutorial.texi clean: - rm -rf tutorial.aux tutorial.cp tutorial.cps tutorial.fn tutorial.ky tutorial.pg tutorial.tp tutorial.vr tutorial.toc tutorial.log tutorial.pdf tutorial.html tutorial/ + rm -rf $(TGIF_SOURCES) $(TGIF_EPS) $(TGIF_PNG) tutorial.aux tutorial.cp tutorial.cps tutorial.fn tutorial.ky tutorial.pg tutorial.tp tutorial.vr tutorial.toc tutorial.log tutorial.pdf tutorial.html tutorial/ diff --git a/doc/tutorial/helpers.texi b/doc/tutorial/helpers.texi index b64858173..29ca6bb3f 100644 --- a/doc/tutorial/helpers.texi +++ b/doc/tutorial/helpers.texi @@ -6,7 +6,7 @@ call the "helper API". The helper API is implemented in @code{src/helper/} directory; it depends on (and wraps) the low-level API which is implemented everywhere else in @code{src/}. The following figure shows this relationship. -@center @image{figures/helpers,,,,png} +@center @image{helpers,,,,png} The use of the helper API is optional. It has two main goals: @itemize @bullet