diff options
| author | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
| commit | dd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (patch) | |
| tree | e59914298c52fec7fb00234eb4f22517367f3a44 /erts/emulator/Makefile.in | |
| parent | 986611be9b5050969a58e8bdce864b0eb91133d5 (diff) | |
| parent | 3fd4e3e770fbed95fd6fa2d547945ac71256339c (diff) | |
| download | otp-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/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 74e0d26cff..5e5b98bbd6 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -573,8 +573,8 @@ $(TTF_DIR)/erl_alloc_types.h: beam/erl_alloc.types utils/make_alloc_types GENERATE += $(TTF_DIR)/erl_alloc_types.h # version include file -$(TARGET)/erl_version.h: ../vsn.mk - $(gen_verbose)LANG=C $(PERL) utils/make_version -o $@ $(SYSTEM_VSN) $(SYSTEM_CP_VSN) $(VSN)$(SERIALNO) $(TARGET) +$(TARGET)/erl_version.h: ../vsn.mk $(ERL_TOP)/make/$(TARGET)/otp.mk + $(gen_verbose)LANG=C $(PERL) utils/make_version -o $@ $(SYSTEM_VSN) $(OTP_VERSION) $(VSN)$(SERIALNO) $(TARGET) GENERATE += $(TARGET)/erl_version.h # driver table |