diff options
| author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:50:42 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:50:42 +0100 |
| commit | d299987d7e22d1236f14a4e097e8ee805a1b72ea (patch) | |
| tree | 377b3ffd0c088580b1713f51d238c46e24da9fd2 /erts/etc | |
| parent | ac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff) | |
| parent | a9340a1692b0ae4d3b3c0328d007ac4a7db5cc75 (diff) | |
| download | otp-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/etc')
| -rw-r--r-- | erts/etc/unix/Install.src | 2 | ||||
| -rw-r--r-- | erts/etc/win32/Install.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src index 0f33258a28..8eb1db75bd 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -137,9 +137,9 @@ case $start_option in esac cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . +cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot . cp -p $Name.boot start.boot cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script - # # Fixing the man pages # diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c index dd02a9c111..c46bb89f7c 100644 --- a/erts/etc/win32/Install.c +++ b/erts/etc/win32/Install.c @@ -47,7 +47,7 @@ int main(int argc, char **argv) char *binaries[] = { "erl.exe", "werl.exe", "erlc.exe", "dialyzer.exe", "typer.exe", "escript.exe", "ct_run.exe", NULL }; - char *scripts[] = { "start_clean.boot", "start_sasl.boot", NULL }; + char *scripts[] = { "start_clean.boot", "start_sasl.boot", "no_dot_erlang.boot", NULL }; char fromname[MAX_PATH]; char toname[MAX_PATH]; |