Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 18 insertions, 11 deletions

diff --git a/erts/Makefile.in b/erts/Makefile.in
index 92fdc7a862..3052dc3065 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -1,18 +1,19 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2006-2013. All Rights Reserved.
+# Copyright Ericsson AB 2006-2016. 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
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 # 
@@ -48,6 +49,7 @@ debug opt clean:
 			( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \
 		fi ; \
 	done
+	(cd preloaded/src && $(MAKE) ../ebin/erts.app)
 
 # ----------------------------------------------------------------------
 # These are "convenience targets", provided as shortcuts for developers
@@ -107,7 +109,8 @@ local_setup:
 	fi
 	@cd start_scripts && $(MAKE) $(ERL_TOP)/bin/start.script \
 		$(ERL_TOP)/bin/start_sasl.script \
-		$(ERL_TOP)/bin/start_clean.script
+		$(ERL_TOP)/bin/start_clean.script \
+		$(ERL_TOP)/bin/no_dot_erlang.script
 
 # Run the configure script
 .PHONY: configure
@@ -134,6 +137,10 @@ release:
 			( cd $$d && $(MAKE) $@ ) || exit $$? ; \
 		fi ; \
 	 done
+	( $(MAKE) -f "$(ERL_TOP)/make/otp_released_app.mk"	\
+		APP_PWD="$(ERL_TOP)/erts" APP_VSN=VSN APP=erts	\
+		TESTROOT="$(TESTROOT)" update)			\
+	 || exit $$?
 
 .PHONY: release_docs
 release_docs: