diff options
| author | Lukas Larsson <[email protected]> | 2018-04-06 17:09:04 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-04-10 14:07:59 +0200 |
| commit | 63eef4c488c46d3b4957fbbf155158f1af8180ed (patch) | |
| tree | c28e26065d384d2b641e1bbfea1a37ab5d354105 /make | |
| parent | ec7be0d6f6ccff9aaae0f1bd0461812c898e13e9 (diff) | |
| download | otp-63eef4c488c46d3b4957fbbf155158f1af8180ed.tar.gz otp-63eef4c488c46d3b4957fbbf155158f1af8180ed.tar.bz2 otp-63eef4c488c46d3b4957fbbf155158f1af8180ed.zip | |
erl_docgen: Fix ghlinks to .xmlsrc
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 5 | ||||
| -rw-r--r-- | make/otp_release_targets.mk | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index 6692b575ff..c514a150ca 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -303,9 +303,8 @@ $(MAN6DIR)/%.6 $(MAN6DIR)/%.7: $(XMLDIR)/%_app.xml $(gen_verbose)date=`date +"%B %e, %Y"`; \ xsltproc --output "$@" $(MANXSLTARGS) $(DOCGEN)/priv/xsl/db_man.xsl $< - -$(XMLDIR)/%.xml: %.xmlsrc - $(gen_verbose)escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@ +$(XMLDIR)/%.xml: $(XMLDIR)/%.xmlsrc + $(gen_verbose)escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $(shell pwd) $< $@ .fo.pdf: $(FOP) -c $(FOP_CONFIG) -cache $(ERL_TOP)/make/$(TARGET)/fop-fonts.cache -fo $< -pdf $@ diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk index 9a6384af59..5ba025d98b 100644 --- a/make/otp_release_targets.mk +++ b/make/otp_release_targets.mk @@ -40,7 +40,11 @@ _create_xml_dirs := $(shell mkdir -p $(XMLDIR)) XML_GEN_FILES+=$(patsubst %.xml,$(XMLDIR)/%.xml,$(XML_FILES)) $(XMLDIR)/%.xml: %.xml - $(gen_verbose)escript $(DOCGEN)/priv/bin/github_link.escript $^ \ + $(gen_verbose)escript $(DOCGEN)/priv/bin/github_link.escript $< \ + "$(subst $(ERL_TOP)/,,$(CURDIR)/$^)" "$(shell git rev-parse HEAD)" $@ + +$(XMLDIR)/%.xmlsrc: %.xmlsrc + $(gen_verbose)escript $(DOCGEN)/priv/bin/github_link.escript $< \ "$(subst $(ERL_TOP)/,,$(CURDIR)/$^)" "$(shell git rev-parse HEAD)" $@ ifeq ($(TOPDOC),) |