diff options
| author | Lukas Larsson <lukas@erlang.org> | 2016-08-12 11:27:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2016-08-12 11:27:33 +0200 |
| commit | 9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2 (patch) | |
| tree | 52d5945fc0b4adde8fc73ba3f0e410f3c02b7828 /make | |
| parent | cd54106596b3471b42b59693a40e21b58729cdb0 (diff) | |
| parent | daa0f831aee9dedf8cdf29fd5f97f98f55e072e3 (diff) | |
| download | otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.gz otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.bz2 otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.zip | |
Merge branch 'maint'
Conflicts:
lib/gs/doc/src/Makefile
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 |