diff options
| author | Lukas Larsson <[email protected]> | 2016-08-12 11:26:48 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-08-12 11:26:48 +0200 |
| commit | daa0f831aee9dedf8cdf29fd5f97f98f55e072e3 (patch) | |
| tree | 6365e6511bf76044129a7947887200e72e828cbc /make | |
| parent | 634998007ebd494cc64db244b748ed52bdff6a0a (diff) | |
| parent | 0e00f80fb74f8f449eacf237e84a698a5555e7bd (diff) | |
| download | otp-daa0f831aee9dedf8cdf29fd5f97f98f55e072e3.tar.gz otp-daa0f831aee9dedf8cdf29fd5f97f98f55e072e3.tar.bz2 otp-daa0f831aee9dedf8cdf29fd5f97f98f55e072e3.zip | |
Merge branch 'binarin/even-more-absolute-paths/PR-1103/OTP-13800' into maint
* binarin/even-more-absolute-paths/PR-1103/OTP-13800:
Use perl discovered by configure
Don't make assumptions about build tools paths
Diffstat (limited to 'make')
| -rwxr-xr-x[-rw-r--r--] | make/emd2exml.in | 2 | ||||
| -rwxr-xr-x | make/make_emakefile.in (renamed from make/make_emakefile) | 2 | ||||
| -rw-r--r-- | make/otp.mk.in | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/make/emd2exml.in b/make/emd2exml.in index 903d707716..b4e052fef5 100644..100755 --- a/make/emd2exml.in +++ b/make/emd2exml.in @@ -1,4 +1,4 @@ -#!/usr/bin/env escript +#!@ENV@ escript %% -*- erlang -*- %%! -smp disable diff --git a/make/make_emakefile b/make/make_emakefile.in index 56440d9bf0..fbca77887a 100755 --- a/make/make_emakefile +++ b/make/make_emakefile.in @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!@PERL@ # -*- cperl -*- use strict; diff --git a/make/otp.mk.in b/make/otp.mk.in index 3b2e1a5bba..7e2945b561 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -260,6 +260,7 @@ DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif XSLTPROC = @XSLTPROC@ FOP = @FOP@ XMLLINT = @XMLLINT@ +CP = @CP@ DOCGEN=$(ERL_TOP)/lib/erl_docgen FOP_CONFIG = $(DOCGEN)/priv/fop.xconf |