diff options
| author | Lars Thorsen <[email protected]> | 2013-01-21 15:01:58 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2013-01-21 15:01:58 +0100 |
| commit | bb65d760aa2281c4a7bb216ec1c858813869759d (patch) | |
| tree | a861d3632bd29106f9f2fe2f7dcd0f2de7ee8020 /make | |
| parent | 043da0de9576732671fb61f560070932024dde87 (diff) | |
| parent | fdd89ea15130484cb29c27b18b22c8835108f20f (diff) | |
| download | otp-bb65d760aa2281c4a7bb216ec1c858813869759d.tar.gz otp-bb65d760aa2281c4a7bb216ec1c858813869759d.tar.bz2 otp-bb65d760aa2281c4a7bb216ec1c858813869759d.zip | |
Merge branch 'lars/erl_docgen/indenterings-bug/OTP-10725'
* lars/erl_docgen/indenterings-bug/OTP-10725:
[erl_docgen] Fix include path to xmllint
[erl_docgen] Update vsn.mk
[erl_docgen] Add xmllint target for the documentation and fix some DTD errors
[erl_docgen] Fix dtd error for type_desc tag
[erl_docgen] Fix pdf indentation bug for tagged lists
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 1 | ||||
| -rw-r--r-- | make/otp_release_targets.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index 0e58a27016..fca9cf3cff 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -255,6 +255,7 @@ DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif # XSLTPROC = @XSLTPROC@ FOP = @FOP@ +XMLLINT = @XMLLINT@ DOCGEN=$(ERL_TOP)/lib/erl_docgen FOP_CONFIG = $(DOCGEN)/priv/fop.xconf diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk index 0be0a2de56..65a2e62979 100644 --- a/make/otp_release_targets.mk +++ b/make/otp_release_targets.mk @@ -106,6 +106,9 @@ $(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES) $(SPECS_FILES) docs: $(HTMLDIR)/$(APPLICATION).eix +xmllint: $(XML_FILES) + $(XMLLINT) --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities $(XML_FILES) + # ---------------------------------------------------- # Local documentation target for testing # ---------------------------------------------------- |