diff options
| author | Rickard Green <[email protected]> | 2014-02-16 00:54:08 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-19 15:30:44 +0100 |
| commit | 3fd4e3e770fbed95fd6fa2d547945ac71256339c (patch) | |
| tree | a856f741c5d307d4e56334b650740d7e22073cbf /Makefile.in | |
| parent | a37ea8849ab29cb8d15ab3bc5a3ba1fc16dd0276 (diff) | |
| download | otp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.tar.gz otp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.tar.bz2 otp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.zip | |
Misc adjustments of OTP version
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index d3d81c8817..567bd427fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -172,6 +172,7 @@ endif TARGET := @TARGET@ include $(ERL_TOP)/make/target.mk export TARGET +include $(ERL_TOP)/make/otp_default_release_path.mk BOOTSTRAP_ONLY = @BOOTSTRAP_ONLY@ @@ -395,6 +396,11 @@ endif cd $(ERL_TOP)/erts && \ ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)"$${PATH}" \ $(MAKE) BUILD_ALL=1 TESTROOT="$(RELEASE_ROOT)" release +ifeq ($(RELEASE_ROOT),) + $(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(OTP_DEFAULT_RELEASE_PATH)" +else + $(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(RELEASE_ROOT)" +endif # --------------------------------------------------------------- # Target only used when building commercial ERTS patches @@ -921,7 +927,7 @@ $(TEST_DIRS): # # Order is important here, don't change it! # -INST_DEP += install.dirs install.emulator install.libs install.Install install.bin +INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin install: $(INST_DEP) @@ -950,6 +956,13 @@ install.Install: (cd "$(ERLANG_LIBDIR)" \ && ./Install $(INSTALL_CROSS) -minimal "$(ERLANG_INST_LIBDIR)") +install.otp_version: +ifeq ($(ERLANG_LIBDIR),) + $(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(OTP_DEFAULT_RELEASE_PATH)" +else + $(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(ERLANG_LIBDIR)" +endif + # # Install erlang base public files # |