diff options
| -rw-r--r-- | sandbox/mallard/html/Makefile | 14 | ||||
| -rw-r--r-- | xslt/mallard/html/mal2html.xsl | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sandbox/mallard/html/Makefile b/sandbox/mallard/html/Makefile index d5f47cb..f49ba30 100644 --- a/sandbox/mallard/html/Makefile +++ b/sandbox/mallard/html/Makefile @@ -1,5 +1,5 @@ -xslts=$(wildcard ../xslt/*.xsl) -specs=$(filter-out ../spec/legal.xml, $(wildcard ../spec/*.xml)) +xslts=$(wildcard ../../../xslt/mallard/common/*.xsl) $(wildcard ../../../xslt/mallard/html/*.xsl) +specs=$(filter-out ../../../doc/mallard/C/legal.xml, $(wildcard ../../../doc/mallard/C/*.xml)) pages=$(patsubst %.xml,%.xhtml, $(notdir $(specs))) all: $(pages) figures mallard.cache @@ -10,18 +10,18 @@ mallard.cache : $(specs) $(xslts) echo "<page href='$$file'/>" >> $@.in; \ done echo '</cache>' >> $@.in - xsltproc ../xslt/mal2cache.xsl $@.in | xmllint --format - > $@ + xsltproc ../../../xslt/mallard/utils/mal2cache.xsl $@.in | xmllint --format - > $@ rm $@.in -$(pages) : mallard.cache ../xslt/theme.xml $(xslts) -$(pages) : %.xhtml : ../spec/%.xml +$(pages) : mallard.cache $(xslts) +$(pages) : %.xhtml : ../../../doc/mallard/C/%.xml xsltproc -o $@ \ --stringparam mal.cache_file `pwd`/mallard.cache \ - ../xslt/mal2html.xsl $< + ../../../xslt/mallard/html/mal2html.xsl $< figures: if [ ! -d figures ]; then mkdir figures; fi - cp ../spec/figures/*.png figures/ + cp ../../../doc/mallard/C/figures/*.png figures/ .PHONY: clean clean: diff --git a/xslt/mallard/html/mal2html.xsl b/xslt/mallard/html/mal2html.xsl index cbe3ac6..71685a1 100644 --- a/xslt/mallard/html/mal2html.xsl +++ b/xslt/mallard/html/mal2html.xsl @@ -27,7 +27,7 @@ Mallard to HTML REMARK: Describe this module --> -<xsl:include href="mal-link.xsl"/> +<xsl:include href="../common/mal-link.xsl"/> <xsl:include href="mal2html-block.xsl"/> <xsl:include href="mal2html-css.xsl"/> |