summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2021-09-01 17:52:09 +0200
committerLukas Larsson <lukas@erlang.org>2021-09-30 13:51:40 +0200
commitd796863e069ab8f322802d08a0ada8e8eca2cc88 (patch)
tree61dd8c5d59181aa2f3e25e29dfdaa22b2a078a3f
parent20c0c5a38742f5512a04b665bbce7065539500ba (diff)
downloaderlang-d796863e069ab8f322802d08a0ada8e8eca2cc88.tar.gz
Fix `make local_html` to work better
* Build mod2app.xml for specs lookup * link otp_doc.css for easier editing
-rw-r--r--Makefile.in2
-rw-r--r--make/otp_release_targets.mk7
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index ab2fc77b06..bf867f66ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -451,7 +451,7 @@ endif
$(DOCGEN)/priv/bin/validate_links.escript $(ERL_TOP) make/$(TARGET)/mod2app.xml \
lib/*/doc/xml/*.xml erts/doc/xml/*.xml system/doc/xml/*/*.xml
-mod2app: $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+mod2app: doc_bootstrap_build doc_bootstrap_copy $(ERL_TOP)/make/$(TARGET)/mod2app.xml
$(ERL_TOP)/make/$(TARGET)/mod2app.xml: erts/doc/src/Makefile lib/*/doc/src/Makefile
PATH=$(BOOT_PREFIX)"$${PATH}" escript $(BOOTSTRAP_ROOT)/bootstrap/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index a2ba51c9cf..c594f5c07f 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -187,8 +187,11 @@ local_docs: local_copy_of_topdefs docs
local_html: TOPDOCDIR=.
local_html: local_copy_of_topdefs html
-local_copy_of_topdefs:
- $(INSTALL) $(DOCGEN)/priv/css/otp_doc.css $(HTMLDIR)
+$(HTMLDIR)/otp_doc.css:
+ ln -s $(DOCGEN)/priv/css/otp_doc.css $(HTMLDIR)/otp_doc.css
+
+local_copy_of_topdefs: $(HTMLDIR)/otp_doc.css
+ cd $(ERL_TOP) && make mod2app
$(INSTALL) $(DOCGEN)/priv/images/erlang-logo.png $(HTMLDIR)
$(INSTALL) $(DOCGEN)/priv/images/erlang-logo.gif $(HTMLDIR)
$(INSTALL_DIR) $(HTMLDIR)/js/flipmenu