[vlc-commits] contrib: use a variable to get the extra tools path

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar  5 09:39:09 2019 +0100| [430ed6c1e11adbf59642f657e6a726b2cd7de3e1] | committer: Steve Lhomme

contrib: use a variable to get the extra tools path

The VLC_TOOLS variable can also be set in the environment in case the tools are
found elsewhere.

(cherry picked from commit 8a483e84c9a7b9107f1fdca38c1dcbf404e43916) (edited)

edited:
- this branch did not have an equivalent of $(VLC_TOOLS)/share/aclocal in ACLOCAL_AMFLAGS

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=430ed6c1e11adbf59642f657e6a726b2cd7de3e1
---

 contrib/src/main.mak | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index b88a9b1184..6995354f36 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -7,8 +7,9 @@ all: install
 
 SRC := $(TOPSRC)/src
 TARBALLS := $(TOPSRC)/tarballs
+VLC_TOOLS ?= $(TOPSRC)/../extras/tools/build
 
-PATH :=$(abspath ../../extras/tools/build/bin):$(PATH)
+PATH :=$(abspath $(VLC_TOOLS)/bin):$(PATH)
 export PATH
 
 PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
@@ -138,7 +139,7 @@ CCAS=$(CC) -c
 
 ifdef HAVE_IOS
 ifdef HAVE_NEON
-AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
+AS=perl $(abspath $(VLC_TOOLS)/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
 endif
 endif
@@ -191,6 +192,9 @@ HAVE_FPU = 1
 endif
 
 ACLOCAL_AMFLAGS += -I$(PREFIX)/share/aclocal
+ifneq ($(wildcard $(VLC_TOOLS)/share/aclocal/*),)
+ACLOCAL_AMFLAGS += -I$(abspath $(VLC_TOOLS)/share/aclocal)
+endif
 export ACLOCAL_AMFLAGS
 
 #########