aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface
diff options
context:
space:
mode:
authorAlexey Lebedeff <[email protected]>2016-06-15 10:40:36 +0300
committerAlexey Lebedeff <[email protected]>2016-06-15 10:40:36 +0300
commit9f9841eb7327c9fe73e84e197fd2965a97b639cf (patch)
treeb124a5d370468e47a289db92a2d52933e60a9d00 /lib/jinterface
parent481ac2a246c53c29033648ae5adda2c215fcc924 (diff)
downloadotp-9f9841eb7327c9fe73e84e197fd2965a97b639cf.tar.gz
otp-9f9841eb7327c9fe73e84e197fd2965a97b639cf.tar.bz2
otp-9f9841eb7327c9fe73e84e197fd2965a97b639cf.zip
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.
Diffstat (limited to 'lib/jinterface')
-rw-r--r--lib/jinterface/doc/src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index cd1e61a795..508c8e01b5 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -166,7 +166,7 @@ release_docs_spec: docs
$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)"
$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
- (/bin/cp -rf ../html "$(RELSYSDIR)/doc")
+ ($(CP) -rf ../html "$(RELSYSDIR)/doc")
# $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
# "$(RELSYSDIR)/doc/html"