[vlc-devel] [PATCH 2/7] contrib: call pkg-static via the SRC variable

[Steve Lhomme]

---
 contrib/src/aom/rules.mak      | 2 +-
 contrib/src/libdsm/rules.mak   | 2 +-
 contrib/src/main.mak           | 2 +-
 contrib/src/speex/rules.mak    | 2 +-
 contrib/src/speexdsp/rules.mak | 2 +-
 contrib/src/vpx/rules.mak      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index f8e3d0b632..cc362a7315 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -94,6 +94,6 @@ endif
 	cd $< && mkdir -p aom_build
 	cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
 	cd $< && $(MAKE) -C aom_build
-	cd $</aom_build && ../../../../contrib/src/pkg-static.sh aom.pc
+	cd $</aom_build && $(SRC)/pkg-static.sh aom.pc
 	cd $</aom_build && $(MAKE) install
 	touch $@
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 1ea9b769b5..7b6ab9e0da 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -35,6 +35,6 @@ endif
 	$(RECONF)
 	cd $< && $(HOSTVARS_PIC) ./configure --disable-programs $(LIBDSM_CONF)
 	cd $< && $(MAKE)
-	cd $< && ../../../contrib/src/pkg-static.sh libdsm.pc
+	cd $< && $(SRC)/pkg-static.sh libdsm.pc
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 32a489331f..445162f4a2 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -345,7 +345,7 @@ UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.zip,$^), && unzip $(f))
 UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
-pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
+pkg_static = (cd $(UNPACK_DIR) && $(SRC)/pkg-static.sh $(1))
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
 
 AUTOMAKE_DATA_DIRS=$(foreach n,$(foreach n,$(subst :, ,$(shell echo $$PATH)),$(abspath $(n)/../share)),$(wildcard $(n)/automake*))
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 455c1b5f99..ebe1ed251d 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -31,6 +31,6 @@ endif
 .speex: speex
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
 	cd $< && $(MAKE)
-	cd $< && ../../../contrib/src/pkg-static.sh speex.pc
+	cd $< && $(SRC)/pkg-static.sh speex.pc
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 420bae9bed..eceb8731e4 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -36,6 +36,6 @@ endif
 	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
 	cd $< && $(MAKE)
-	cd $< && ../../../contrib/src/pkg-static.sh speexdsp.pc
+	cd $< && $(SRC)/pkg-static.sh speexdsp.pc
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 7b405b956f..5604342a8d 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -164,6 +164,6 @@ endif
 	cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) ./configure --target=$(VPX_TARGET) \
 		$(VPX_CONF) --prefix=$(PREFIX)
 	cd $< && $(MAKE)
-	cd $< && ../../../contrib/src/pkg-static.sh vpx.pc
+	cd $< && $(SRC)/pkg-static.sh vpx.pc
 	cd $< && $(MAKE) install
 	touch $@
-- 
2.17.1