diff options
| author | Lars Thorsen <[email protected]> | 2011-12-09 13:05:30 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-12-09 13:05:30 +0100 |
| commit | 78bbed8a811116bb9a3332336e97fecd06a338db (patch) | |
| tree | a37ec133814ca73a087e8c4964059833cf0450eb | |
| parent | c20450e213fccaf38e39f9416d619515c50870ed (diff) | |
| parent | ab5437ed686334bce133c89ef6f7638d90812c6d (diff) | |
| download | otp-78bbed8a811116bb9a3332336e97fecd06a338db.tar.gz otp-78bbed8a811116bb9a3332336e97fecd06a338db.tar.bz2 otp-78bbed8a811116bb9a3332336e97fecd06a338db.zip | |
Merge branch 'lars/doc-include-path-error'
* lars/doc-include-path-error:
Fix error in dtd include paths to xsltproc.
| -rw-r--r-- | lib/snmp/doc/src/Makefile | 2 | ||||
| -rw-r--r-- | system/doc/top/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile index df597c8ba7..8645886590 100644 --- a/lib/snmp/doc/src/Makefile +++ b/lib/snmp/doc/src/Makefile @@ -165,7 +165,7 @@ $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib $(MAN1DIR)/snmpc.1: snmpc_cmd.xml date=`date +"%B %e %Y"`; \ - xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $< + xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $< include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile index aac90fcaa4..11920ec9d1 100644 --- a/system/doc/top/Makefile +++ b/system/doc/top/Makefile @@ -165,7 +165,7 @@ $(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/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities \ + --stringparam appver "$(VSN)" -path $(DOCGEN)/priv/dtd -path $(DOCGEN)/priv/dtd_html_entities \ $(DOCGEN)/priv/xsl/db_html.xsl $< @@ -173,7 +173,7 @@ $(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/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities \ + --stringparam appver "$(VSN)" -path $(DOCGEN)/priv/dtd -path $(DOCGEN)/priv/dtd_html_entities \ $(DOCGEN)/priv/xsl/db_html.xsl $< #-------------------------------------------------------------------------- |