[vlc-devel] [PATCH 5/7] contrib: use a variable to get the extra tools path

[Steve Lhomme]

---
 contrib/src/main.mak | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 4eb679e390..57dffdfd6c 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -12,8 +12,9 @@ TOPSRC ?= ../../contrib
 TOPDST ?= ..
 SRC := $(TOPSRC)/src
 TARBALLS := $(TOPSRC)/tarballs
+TOOLS := $(TOPSRC)/../extras/tools/build
 
-PATH :=$(abspath ../../extras/tools/build/bin):$(PATH)
+PATH :=$(abspath $(TOOLS)/bin):$(PATH)
 export PATH
 
 PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
@@ -136,7 +137,7 @@ CCAS=$(CC) -c
 
 ifdef HAVE_IOS
 ifdef HAVE_NEON
-AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
+AS=perl $(abspath $(TOOLS)/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
 endif
 EXTRA_CFLAGS += $(CFLAGS)
@@ -198,8 +199,8 @@ HAVE_FPU = 1
 endif
 
 ACLOCAL_AMFLAGS += -I$(PREFIX)/share/aclocal
-ifneq ($(wildcard $(TOPSRC)/../extras/tools/build/share/aclocal/*),)
-ACLOCAL_AMFLAGS += -I$(abspath $(TOPSRC)/../extras/tools/build/share/aclocal)
+ifneq ($(wildcard $(TOOLS)/share/aclocal/*),)
+ACLOCAL_AMFLAGS += -I$(abspath $(TOOLS)/share/aclocal)
 endif
 export ACLOCAL_AMFLAGS
 
-- 
2.17.1