aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-03-31 15:42:04 +0200
committerRickard Green <[email protected]>2014-03-31 15:42:04 +0200
commit841ed47354afb2ac15f17e945d82e569f17ca1ae (patch)
tree9b9290f29897afaf89ad9490b1d08931ff4fad66 /Makefile.in
parentb7764ebe9c9284c242774f6d076a8c6d190638fa (diff)
parentffa393096b435cde37fa1db654a012fe3175bd02 (diff)
downloadotp-841ed47354afb2ac15f17e945d82e569f17ca1ae.tar.gz
otp-841ed47354afb2ac15f17e945d82e569f17ca1ae.tar.bz2
otp-841ed47354afb2ac15f17e945d82e569f17ca1ae.zip
Merge branch 'rickard/otp_patch_apply'
* rickard/otp_patch_apply: Replace 'otp_build patch_app' with 'otp_patch_apply'
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index c667eb5f79..4dc5ebac40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -422,6 +422,10 @@ endif
cd $(ERL_TOP)/system/doc && \
PATH=$(BOOT_PREFIX)"$${PATH}" \
ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT="$(RELEASE_ROOT)" DOCGEN=$(BOOTSTRAP_ROOT)/bootstrap/lib/erl_docgen $@
+ifneq ($(OTP_SMALL_BUILD),true)
+ echo "OTP doc built" > $(ERL_TOP)/make/otp_doc_built
+endif
+
mod2app:
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
@@ -447,6 +451,7 @@ else
$(make_verbose)cd lib && \
ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
$(MAKE) opt BUILD_ALL=true
+ echo "OTP built" > $(ERL_TOP)/make/otp_built
endif
kernel:
$(make_verbose)cd lib/kernel && \