aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2012-11-19 14:22:41 +0100
committerLars Thorsen <[email protected]>2012-11-19 14:22:41 +0100
commit2cec24c37208c360123740f3af6b09aa33697f5f (patch)
tree0385c4f21e893cbeec7e9228f13aa6039cbb6521 /system
parent22e6663608240c3f7beb41fd4e76975f9c490017 (diff)
parentc344975f28584e70240b82ae955ea1260276f89d (diff)
downloadotp-2cec24c37208c360123740f3af6b09aa33697f5f.tar.gz
otp-2cec24c37208c360123740f3af6b09aa33697f5f.tar.bz2
otp-2cec24c37208c360123740f3af6b09aa33697f5f.zip
Merge branch 'maint'
* maint: [erl_docgen] Updated the vsn.mk [erl_docgen] Add db_eix.xsl to the Makefile [safs] Add pdfname to the html target for the users guide [erl_docgen] Add possibility to specify pdf filename Updated system/doc/Makefile with the new xsltproc options. A possibility to configure erl_docgen so it can generate documentation for other products than Erlang/OTP.
Diffstat (limited to 'system')
-rw-r--r--system/doc/top/Makefile29
1 files changed, 23 insertions, 6 deletions
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 9b305eb13b..673ba44c94 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -163,17 +163,34 @@ $(MAN_INDEX): $(MAN_INDEX_SCRIPT)
$(HTMLDIR)/highlights.html: highlights.xml
date=`date +"%B %e %Y"`; \
- $(XSLTPROC) --output $(@) --stringparam docgen "$(DOCGEN)" --stringparam topdocdir "$(TOPDOCDIR)" \
- --stringparam pdfdir "$(PDFREFDIR)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" \
- --stringparam appver "$(VSN)" -path $(DOCGEN)/priv/dtd -path $(DOCGEN)/priv/dtd_html_entities \
+ $(XSLTPROC) --output $(@) \
+ --stringparam docgen "$(DOCGEN)" \
+ --stringparam topdocdir "$(TOPDOCDIR)" \
+ --stringparam pdfdir "$(PDFREFDIR)" \
+ --stringparam gendate "$$date" \
+ --stringparam appname "$(APPLICATION)" \
+ --stringparam appver "$(VSN)" \
+ --stringparam stylesheet "$(CSS_FILE)" \
+ --stringparam winprefix "$(WINPREFIX)" \
+ --stringparam logo "$(HTMLLOGO_FILE)" \
+ -path $(DOCGEN)/priv/dtd \
+ -path $(DOCGEN)/priv/dtd_html_entities \
$(DOCGEN)/priv/xsl/db_html.xsl $<
$(HTMLDIR)/incompatible.html: incompatible.xml
date=`date +"%B %e %Y"`; \
- $(XSLTPROC) --output $(@) --stringparam docgen "$(DOCGEN)" --stringparam topdocdir "$(TOPDOCDIR)" \
- --stringparam pdfdir "$(PDFREFDIR)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" \
- --stringparam appver "$(VSN)" -path $(DOCGEN)/priv/dtd -path $(DOCGEN)/priv/dtd_html_entities \
+ $(XSLTPROC) --output $(@) --stringparam docgen "$(DOCGEN)" \
+ --stringparam topdocdir "$(TOPDOCDIR)" \
+ --stringparam pdfdir "$(PDFREFDIR)" \
+ --stringparam gendate "$$date" \
+ --stringparam appname "$(APPLICATION)" \
+ --stringparam appver "$(VSN)" \
+ --stringparam stylesheet "$(CSS_FILE)" \
+ --stringparam winprefix "$(WINPREFIX)" \
+ --stringparam logo "$(HTMLLOGO_FILE)" \
+ -path $(DOCGEN)/priv/dtd \
+ -path $(DOCGEN)/priv/dtd_html_entities \
$(DOCGEN)/priv/xsl/db_html.xsl $<
#--------------------------------------------------------------------------