diff options
| author | Siri Hansen <[email protected]> | 2014-02-24 12:28:00 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-02-24 12:28:00 +0100 |
| commit | 287a235b3e2d15bb047967263af5246362c5fdd4 (patch) | |
| tree | 58ae08c3cc7875f49717ecbadcedede1b3c1f2dd /erts/etc/common | |
| parent | e70a2dc2e0fc2ef38a7cdf5bbf13313408003cea (diff) | |
| parent | 1ca1d9d83295e5bd53cc29997ece8e34b19cdf22 (diff) | |
| download | otp-287a235b3e2d15bb047967263af5246362c5fdd4.tar.gz otp-287a235b3e2d15bb047967263af5246362c5fdd4.tar.bz2 otp-287a235b3e2d15bb047967263af5246362c5fdd4.zip | |
Merge branch 'siri/upgrade_SUITE/OTP-11649'
* siri/upgrade_SUITE/OTP-11649:
Include more applications in upgrade_SUITE
Start all non-core applications as temporary in upgrade_SUITE
Allow config to point out old releases in upgrade_SUITE
In upgrade_SUITE stop node with init:stop instead of test_server:stop_node
Skip upgrade_SUITE when running cerl
Use $INSTALL_SCRIPT instead of $INSTALL_DATA for start[_erl].src
Add upgrade_SUITE to test upgrade of OTP release
Diffstat (limited to 'erts/etc/common')
| -rw-r--r-- | erts/etc/common/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index 5c1ce51644..83560735bc 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1996-2012. All Rights Reserved. +# Copyright Ericsson AB 1996-2014. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -488,7 +488,7 @@ ifneq ($(INSTALL_SRC),) $(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src" endif ifneq ($(INSTALL_EMBEDDED_DATA),) - $(INSTALL_DATA) $(INSTALL_EMBEDDED_DATA) "$(RELEASE_PATH)/erts-$(VSN)/bin" + $(INSTALL_SCRIPT) $(INSTALL_EMBEDDED_DATA) "$(RELEASE_PATH)/erts-$(VSN)/bin" endif ifneq ($(INSTALL_LIBS),) $(INSTALL_DATA) $(INSTALL_LIBS) "$(RELEASE_PATH)/erts-$(VSN)/bin" |