[vlc-commits] contrib: use pkg from contribs before the user ones

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Wed Oct 26 17:32:27 2016 +0200| [8a093ab0c5a3b44ac5688d051a81025e1fdd877d] | committer: Rémi Denis-Courmont

contrib: use pkg from contribs before the user ones

If the user directories contain an older or otherwise inadequate
package version, contrib will rebuild a suitable version. If it is a
dependency of another contrib package, then pkg-config needs to look up
the contrib version before the user version.

This behaviour is already what happens for system packages in the
default pkg-config directories: they are processed after the
directories from the environment variable.

(Rewritten description)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a093ab0c5a3b44ac5688d051a81025e1fdd877d
---

 contrib/src/main.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 9042227..d8f1d37 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -216,7 +216,7 @@ PKG_CONFIG_PATH := /usr/share/pkgconfig
 PKG_CONFIG_LIBDIR := /usr/$(HOST)/lib/pkgconfig
 export PKG_CONFIG_LIBDIR
 endif
-PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(PREFIX)/lib/pkgconfig
+PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
 export PKG_CONFIG_PATH
 
 ifndef GIT