diff options
| author | Lars Thorsen <[email protected]> | 2012-11-19 14:17:55 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2012-11-19 14:18:49 +0100 |
| commit | c344975f28584e70240b82ae955ea1260276f89d (patch) | |
| tree | 2fd6b430a820b77ae866282d09099af1cc9c4938 /system/doc | |
| parent | 41d6a59fb11c65da9edcf97551b19cbdbf00646f (diff) | |
| parent | 1f31c8faccc8711e8080cb0a7cc8e9ca69ede227 (diff) | |
| download | otp-c344975f28584e70240b82ae955ea1260276f89d.tar.gz otp-c344975f28584e70240b82ae955ea1260276f89d.tar.bz2 otp-c344975f28584e70240b82ae955ea1260276f89d.zip | |
Merge branch 'lars/erl_docgen/configurable_doc_build/OTP-9040' into maint
* lars/erl_docgen/configurable_doc_build/OTP-9040:
[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.
OTP-9040
Diffstat (limited to 'system/doc')
| -rw-r--r-- | system/doc/top/Makefile | 29 |
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 $< #-------------------------------------------------------------------------- |