aboutsummaryrefslogtreecommitdiffstats
path: root/erts/start_scripts/Makefile
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-02-21 11:34:29 +0100
committerRickard Green <[email protected]>2014-02-21 11:34:29 +0100
commitdd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (patch)
treee59914298c52fec7fb00234eb4f22517367f3a44 /erts/start_scripts/Makefile
parent986611be9b5050969a58e8bdce864b0eb91133d5 (diff)
parent3fd4e3e770fbed95fd6fa2d547945ac71256339c (diff)
downloadotp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.gz
otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.bz2
otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.zip
Merge branch 'rickard/otp_version/OTP-11615'
* rickard/otp_version/OTP-11615: Misc adjustments of OTP version
Diffstat (limited to 'erts/start_scripts/Makefile')
-rw-r--r--erts/start_scripts/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index 32e65a227f..14d5d46195 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -52,7 +52,7 @@ endif
##############################################################################
# Get version numbers from the VSN files
-# VSN & SYSTEM_VSN
+# VSN
include ../vsn.mk
include $(LIBPATH)/kernel/vsn.mk
include $(LIBPATH)/stdlib/vsn.mk