Skip to content

include (empty) system configuration file in release #10346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

include (empty) system configuration file in release #10346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,10 @@ endif
$(MAKE) BUILD_ALL=1 PROFILE=$(PROFILE) TESTROOT="$(RELEASE_ROOT)" release
ifeq ($(RELEASE_ROOT),)
$(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(OTP_DEFAULT_RELEASE_PATH)/releases/@OTP_REL@"
$(INSTALL_DATA) sys.config "$(OTP_DEFAULT_RELEASE_PATH)/releases/@OTP_REL@"
else
$(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(RELEASE_ROOT)/releases/@OTP_REL@"
$(INSTALL_DATA) sys.config "$(RELEASE_ROOT)/releases/@OTP_REL@"
endif

# ---------------------------------------------------------------
Expand Down Expand Up @@ -855,7 +857,7 @@ $(TEST_DIRS):
#
# Order is important here, don't change it!
#
INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin
INST_DEP += sys.config install.dirs install.emulator install.libs install.Install install.otp_version install.config install.bin

install: $(INST_DEP)

Expand Down Expand Up @@ -891,6 +893,13 @@ else
$(INSTALL_DATA) "$(ERL_TOP)/OTP_VERSION" "$(ERLANG_LIBDIR)/releases/@OTP_REL@"
endif

install.config: sys.config
ifeq ($(ERLANG_LIBDIR),)
$(INSTALL_DATA) $< "$(OTP_DEFAULT_RELEASE_PATH)/releases/@OTP_REL@"
else
$(INSTALL_DATA) $< "$(ERLANG_LIBDIR)/releases/@OTP_REL@"
endif

#
# Install erlang base public files
#
Expand Down
1 change: 1 addition & 0 deletions sys.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[].
Loading