diff --git a/doc/Makefile.am b/doc/Makefile.am
index d982c5cd..370aed86 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,36 +12,21 @@ man5_MANS = man.out/*.5
endif
html.out/*: html.out
-html.out: api.work
+html.out:
-rm -fr html.tmp html.out
$(MKDIR_P) html.tmp
- $(XSLTPROC) --nonet --path "$(srcdir)/api" --xinclude -o "html.tmp/tools.html" "api.work/html.xsl" "$(srcdir)/tools/tools.xml"
+ $(XSLTPROC) --nonet --path "$(srcdir):$(xslstylesheetsdir)/html" --xinclude -o "html.tmp/tools.html" "html.xsl" "$(srcdir)/tools/tools.xml"
mv html.tmp html.out
man.out/*.1: man.out
-man.out: api.work
+man.out:
-rm -fr man.tmp man.out
$(MKDIR_P) man.tmp
- $(XSLTPROC) --nonet --path "$(srcdir)/api" --xinclude -o "man.tmp/" "api.work/man.xsl" "$(srcdir)/tools/tools.xml"
+ $(XSLTPROC) --nonet --path "$(srcdir):$(xslstylesheetsdir)/manpages" --xinclude -o "man.tmp/" "man.xsl" "$(srcdir)/tools/tools.xml"
mv man.tmp man.out
man.out/*.5: man.out/*.1
-#
-# This part is needed as found no
-# way to make xsltproc find xsl-stylesheets
-# in builddir while xsl on srcdir
-#
-api.work: \
- $(abs_srcdir)/html.xsl \
- $(abs_srcdir)/man.xsl \
- $(abs_srcdir)/api.css
- -rm -fr api.work
- $(MKDIR_P) api.work
- $(LN_S) "$(abs_srcdir)/html.xsl" api.work/html.xsl
- $(LN_S) "$(abs_srcdir)/man.xsl" api.work/man.xsl
- $(LN_S) "$(abs_srcdir)/api.css" api.work/api.css
- $(LN_S) "$(xslstylesheetsdir)" api.work/xsl-stylesheets
clean-local:
- -rm -fr html.tmp man.tmp api.work html.out man.out
+ -rm -fr html.tmp man.tmp html.out man.out
diff --git a/doc/html.xsl b/doc/html.xsl
index 93e75268..a9a95ee2 100644
--- a/doc/html.xsl
+++ b/doc/html.xsl
@@ -3,14 +3,13 @@
]>
-
+
-
+
-
diff --git a/doc/man.xsl b/doc/man.xsl
index 1496fb1a..892a6a81 100644
--- a/doc/man.xsl
+++ b/doc/man.xsl
@@ -1,4 +1,4 @@
-
+