aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-11-20 13:54:29 +0100
committerSverker Eriksson <[email protected]>2018-11-20 13:54:29 +0100
commitc0812d51fbb550d4a53df128e4ec322746f015ca (patch)
tree1a99c0fc17a740f1be2030458c9f5c8e6455446d
parentd743f51960384dd17ae3cb905ec57e8012c3abd7 (diff)
parentbb64fbee319ed0eddebba965349f36d078b36236 (diff)
downloadotp-c0812d51fbb550d4a53df128e4ec322746f015ca.tar.gz
otp-c0812d51fbb550d4a53df128e4ec322746f015ca.tar.bz2
otp-c0812d51fbb550d4a53df128e4ec322746f015ca.zip
Merge branch 'sverker/fixup-dev-runtime-deps' into maint
* sverker/fixup-dev-runtime-deps: Fix fixup of development runtime deps
-rw-r--r--Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 9f053963c4..fa7c128379 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