Mercurial > hg > octave-nkf
changeset 6031:fd26599c1841
[project @ 2006-10-04 16:09:38 by jwe]
| author | jwe |
|---|---|
| date | Wed, 04 Oct 2006 16:09:38 +0000 |
| parents | 004037def470 |
| children | dcecca0396e6 |
| files | doc/ChangeLog doc/interpreter/Makefile.in |
| diffstat | 2 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2006-10-04 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (HTML_IMAGES_PNG): New variable. + (HTML/index.html): Depend on $(HTML_IMAGES_PNG) instead of html-figs. + ($(HTML_IMAGES_PNG): HTML/%.png : %.png): New pattern rule. + (html-dir): Delete target. + 2006-10-03 Rafael Laboissiere <rafael@debian.org> * interpreter/mkoctfile.1: Fix indentation for --mex description.
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -31,6 +31,8 @@ IMAGES_PDF = $(SPARSEIMAGES_PDF) IMAGES_PNG = $(SPARSEIMAGES_PNG) IMAGES_TXT = $(SPARSEIMAGES_TXT) + +HTML_IMAGES_PNG = $(addprefix HTML/, $(IMAGES_PNG)) IMAGES = $(IMAGES_EPS) $(IMAGES_PDF) $(IMAGES_PNG) $(IMAGES_TXT) @@ -130,15 +132,17 @@ -I.. -I$(srcdir) -I$(srcdir)/.. $< mv BUGS ../../BUGS -HTML/index.html: html-figs $(TEXINFO) +HTML/index.html: $(HTML_IMAGES_PNG) $(TEXINFO) -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO) -html-figs: $(IMAGES_PNG) html-dir - $(INSTALL_DATA) $(IMAGES_PNG) HTML -.PHONY: html-figs - -html-dir: - if [ -d HTML ]; then true; else mkdir HTML; fi +$(HTML_IMAGES_PNG): HTML/%.png : %.png + @if [ -d HTML ]; then \ + true; \ + else \ + echo "creating HTML directory"; \ + mkdir HTML; \ + fi + $(INSTALL_DATA) $(filter-out html-dir, $<) HTML define run-octave $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \