jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

contrib: fix PKG_CONFIG_PATH environment variable

Browse Source 
main.mak adds local pkg-config paths to the env. var. PKG_CONFIG_PATH
after the existing configuration, so local are tested after globals.
This is an issue if globals contains a package outdated for our needs.
The local setting must be first.

Change-Id: I8f9e060f05d4ac662ac5c23b0dbeaea3b67bd401
Tuleap: #783
This commit is contained in:
Guillaume Roguez
2016-06-27 15:09:19 -04:00
parent 8ca874d790
commit 7479d74ce5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/main.mak
View File

@ -65,7 +65,7 @@ else
PKG_CONFIG ?= pkg-config
endif
PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(PREFIX)/lib/pkgconfig:$(PREFIX)/lib/$(HOST)/pkgconfig
PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PREFIX)/lib/$(HOST)/pkgconfig:$(PKG_CONFIG_PATH)
export PKG_CONFIG_PATH
ifdef HAVE_CROSS_COMPILE