From 9f9841eb7327c9fe73e84e197fd2965a97b639cf Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Wed, 15 Jun 2016 10:40:36 +0300
Subject: Don't make assumptions about build tools paths

One more followup to https://github.com/erlang/otp/pull/1056 and
https://github.com/erlang/otp/pull/1023

This time it's about `/usr/bin/env` and `/bin/cp`:
- `/usr/bin/env` in `diameterc` was used to find the bootstrapped
  `escript` executable. Changed it to exlpicit call to `escript` in
  Makefile.
- `/usr/bin/env` and `/bin/cp` were referenced in documentation
  build/install process. Now full paths to this tools are injected using
  autoconf magic.
---
 make/emd2exml.in | 2 +-
 make/otp.mk.in   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 make/emd2exml.in

(limited to 'make')

diff --git a/make/emd2exml.in b/make/emd2exml.in
old mode 100644
new mode 100755
index 903d707716..b4e052fef5
--- 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/otp.mk.in b/make/otp.mk.in
index c05c499d66..45eda71127 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
-- 
cgit v1.2.3