diff options
| author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
| commit | 423d37395076528866c4b689c0f1e9b72dae58e1 (patch) | |
| tree | b7e8a58df2c8c380d10e275102c07fa737d24908 /erts/etc | |
| parent | a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (diff) | |
| parent | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff) | |
| download | otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.gz otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.bz2 otp-423d37395076528866c4b689c0f1e9b72dae58e1.zip | |
Merge branch 'maint'
Conflicts:
erts/etc/win32/Install.c
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 59a5004662..500fd166f8 100644 --- a/erts/etc/win32/Install.c +++ b/erts/etc/win32/Install.c @@ -49,7 +49,7 @@ int wmain(int argc, wchar_t **argv) wchar_t *binaries[] = { L"erl.exe", L"werl.exe", L"erlc.exe", L"dialyzer.exe", L"typer.exe", L"escript.exe", L"ct_run.exe", NULL }; - wchar_t *scripts[] = { L"start_clean.boot", L"start_sasl.boot", NULL }; + wchar_t *scripts[] = { L"start_clean.boot", L"start_sasl.boot", L"no_dot_erlang.boot", NULL }; wchar_t fromname[MAX_PATH]; wchar_t toname[MAX_PATH]; size_t converted; |