vlc | branch: master | Steve Lhomme <[email protected]> | Tue Mar 5 09:39:09 2019 +0100| [8a483e84c9a7b9107f1fdca38c1dcbf404e43916] | 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a483e84c9a7b9107f1fdca38c1dcbf404e43916 --- 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 e5e8e68899..10954804d8 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)) @@ -142,7 +143,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 EXTRA_CFLAGS += $(CFLAGS) @@ -209,8 +210,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 $(VLC_TOOLS)/share/aclocal/*),) +ACLOCAL_AMFLAGS += -I$(abspath $(VLC_TOOLS)/share/aclocal) endif export ACLOCAL_AMFLAGS _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
