diff options
| author | Erlang/OTP <[email protected]> | 2019-04-16 16:37:40 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-04-16 16:37:40 +0200 |
| commit | 6bc51edfd7efb409230c0ca1dffb7508e65687f9 (patch) | |
| tree | f8c4f992e647dadaca250a0a009efcf333ca40a1 /make/otp.mk.in | |
| parent | 8e033a488a9eff5589c4203785c18effd09e4a07 (diff) | |
| parent | 2599dcfc973d30cfdf438d4587885eda154522ab (diff) | |
| download | otp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.tar.gz otp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.tar.bz2 otp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.zip | |
Merge branch 'rickard/make-fixes-20/OTP-15551' into maint-20
* rickard/make-fixes-20/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 b06c51d0fb..249b8d1e26 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@ @@ -264,7 +265,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 |