diff options
| author | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
| commit | fc8cc0057b1f492f359d4f644fe93fdbc75074e8 (patch) | |
| tree | 63f496f61ea5e63605c5346bd267a9d0f312a96b /erts/emulator/Makefile.in | |
| parent | 589eba64f9c1fdef8a717c930aa8a51c47291a53 (diff) | |
| parent | 47979206defa9429458e419b691138ab1b519833 (diff) | |
| download | otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.gz otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.bz2 otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.zip | |
Merge branch 'rickard/otp-17-vsn-fix'
* rickard/otp-17-vsn-fix:
Fix issues with new versioning
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 5638683f88..b270099566 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -575,7 +575,7 @@ 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) $(VSN)$(SERIALNO) $(TARGET) + $(gen_verbose)LANG=C $(PERL) utils/make_version -o $@ $(SYSTEM_VSN) $(SYSTEM_CP_VSN) $(VSN)$(SERIALNO) $(TARGET) GENERATE += $(TARGET)/erl_version.h # driver table |