diff options
| author | Lukas Larsson <[email protected]> | 2012-05-30 18:57:22 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-30 18:57:22 +0200 |
| commit | 4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (patch) | |
| tree | b9fde95ccaf6151682b22f814a1d4b6e60d01d80 /erts | |
| parent | 283cf3bbce1b31bfd9ef1cc82adaa23eb736a97f (diff) | |
| parent | ab960374d77e7b7a21282017ecef99e21993fb76 (diff) | |
| download | otp-4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1.tar.gz otp-4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1.tar.bz2 otp-4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1.zip | |
Merge branch 'lukas/fix_windows_release_tests/OTP-10099' into maint
* lukas/fix_windows_release_tests/OTP-10099:
Fix compilation of examples and tc names on windows
Create erl.ini for host emulator
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in index 1979c50781..79a66a3ba2 100644 --- a/erts/Makefile.in +++ b/erts/Makefile.in @@ -106,6 +106,7 @@ local_setup: chmod 755 $(ERL_TOP)/bin/erl.exe $(ERL_TOP)/bin/erlc.exe \ $(ERL_TOP)/bin/werl.exe; \ make_local_ini.sh $(ERL_TOP); \ + cp $(ERL_TOP)/bin/erl.ini $(ERL_TOP)/bin/$(TARGET)/erl.ini; \ else \ sed -e "s;%FINAL_ROOTDIR%;$(ERL_TOP);" \ -e "s;erts-.*/bin;bin/$(TARGET);" \ |