diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-08-10 17:41:54 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2014-08-19 15:27:19 +0100 |
| commit | 4288b2a59959c1693bdbc7cbef849942b721c508 (patch) | |
| tree | 97cb4754571ff010e922455bb9b8de71226df3e6 | |
| parent | bc7a3fba087ef8646e93ebda40f344d67f613db5 (diff) | |
Add a work around for trampling over PKG_CONFIG_PATH.
The extend_pkg_path method will be removed in 2.2 as it
causes problems with non-standard pkg-config paths. This
commit adds a workaround until that happens.
| -rw-r--r-- | make/utilities.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/make/utilities.pm b/make/utilities.pm index 8c8ac0d49..42dd6b547 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -95,6 +95,7 @@ sub make_rpath($;$) sub extend_pkg_path() { + return if defined $ENV{DISABLE_EXTEND_PKG_PATH}; if (!exists $ENV{PKG_CONFIG_PATH}) { $ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig"; |