diff options
author | Rickard Green <[email protected]> | 2019-03-04 17:45:46 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2019-03-04 17:45:46 +0100 |
commit | 445e1e5825c63176112580c2724fb5510bd9bd8e (patch) | |
tree | 7050d56706dc0a7dd329875968d4bc61315d8786 /make/otp.mk.in | |
parent | 3e52ed2a13a9cf56edac6d0635f18e348465a66e (diff) | |
parent | b32a929bbb287c318f44cb0ecf17716c480f11ee (diff) | |
download | otp-445e1e5825c63176112580c2724fb5510bd9bd8e.tar.gz otp-445e1e5825c63176112580c2724fb5510bd9bd8e.tar.bz2 otp-445e1e5825c63176112580c2724fb5510bd9bd8e.zip |
Merge branch 'rickard/make-fixes-21/OTP-15551' into maint
* rickard/make-fixes-21/OTP-15551:
Fix install phase in build system
Diffstat (limited to 'make/otp.mk.in')
-rw-r--r-- | make/otp.mk.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index df29d26833..fb573680c8 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -73,6 +73,7 @@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR_DATA = $(ERL_TOP)/make/install_dir_data.sh CC = @CC@ GCC = @GCC@ @@ -273,7 +274,9 @@ DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif XSLTPROC = @XSLTPROC@ FOP = @FOP@ XMLLINT = @XMLLINT@ +RM = @RM@ CP = @CP@ +MKDIR = @MKDIR@ DOCGEN=$(ERL_TOP)/lib/erl_docgen FOP_CONFIG = $(DOCGEN)/priv/fop.xconf |