aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-11-20 13:55:22 +0100
committerSverker Eriksson <[email protected]>2018-11-20 13:55:22 +0100
commit0bcc9fa7fbe302f26cddd48e23d5d5d3eec21943 (patch)
tree2bbd1d95b1de0a0a8b3c8109282a68b09d63346d
parent19c5d33d9d43b92f34af7a8aded415e1286b3091 (diff)
parentc0812d51fbb550d4a53df128e4ec322746f015ca (diff)
downloadotp-0bcc9fa7fbe302f26cddd48e23d5d5d3eec21943.tar.gz
otp-0bcc9fa7fbe302f26cddd48e23d5d5d3eec21943.tar.bz2
otp-0bcc9fa7fbe302f26cddd48e23d5d5d3eec21943.zip
Merge branch 'maint'
-rw-r--r--Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index a07a779f10..240450cdd4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -359,7 +359,8 @@ erlang_inst_libdir_configured:
bootstrap: depend all_bootstraps
check_dev_rt_dep:
- @if `grep DEVELOPMENT "$(ERL_TOP)/make/otp_version_tickets" 1>/dev/null 2>&1`; then \
+ @if `grep DEVELOPMENT "$(ERL_TOP)/make/otp_version_tickets" 1>/dev/null 2>&1 \
+ || grep TESTING "$(ERL_TOP)/make/otp_version_tickets" 1>/dev/null 2>&1`; then \
LANG=C "$(PERL)" "$(ERL_TOP)/make/fixup_development_runtime_dependencies" "$(ERL_TOP)"; \
fi