diff options
| author | Lukas Larsson <[email protected]> | 2012-05-30 18:57:37 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-30 18:57:37 +0200 |
| commit | ac20ee2a68c632ab44f8c6ba151fa37600221288 (patch) | |
| tree | 2d1f509d7b64da745521873427e4a7a35f748260 /erts | |
| parent | ecb81c21bfa0d822493412b7a0d2a6738ca7261a (diff) | |
| parent | 4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (diff) | |
| download | otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.tar.gz otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.tar.bz2 otp-ac20ee2a68c632ab44f8c6ba151fa37600221288.zip | |
Merge branch 'maint'
* maint:
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);" \ |