aboutsummaryrefslogtreecommitdiffstats
path: root/erts/Makefile.in
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-11-29 09:50:42 +0100
committerDan Gudmundsson <[email protected]>2013-11-29 09:50:42 +0100
commitd299987d7e22d1236f14a4e097e8ee805a1b72ea (patch)
tree377b3ffd0c088580b1713f51d238c46e24da9fd2 /erts/Makefile.in
parentac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff)
parenta9340a1692b0ae4d3b3c0328d007ac4a7db5cc75 (diff)
downloadotp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.gz
otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.bz2
otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.zip
Merge branch 'dgud/sasl/no_dot_erlang_boot/OTP-8479' into maint
* dgud/sasl/no_dot_erlang_boot/OTP-8479: sasl: Add no_dot_erlang documentation and tests sasl: Add no_dot_erlang start script
Diffstat (limited to 'erts/Makefile.in')
-rw-r--r--erts/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in
index 92fdc7a862..e3db37d3fd 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -107,7 +107,8 @@ local_setup:
fi
@cd start_scripts && $(MAKE) $(ERL_TOP)/bin/start.script \
$(ERL_TOP)/bin/start_sasl.script \
- $(ERL_TOP)/bin/start_clean.script
+ $(ERL_TOP)/bin/start_clean.script \
+ $(ERL_TOP)/bin/no_dot_erlang.script
# Run the configure script
.PHONY: configure