diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2015-12-11 15:16:34 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2015-12-11 15:20:29 +0000 |
| commit | 853150b0ba9e697e1967abcc4a054591e43b9bde (patch) | |
| tree | 1ef8e7c7314cd5ce6401ad8371f3c9f1dbd1d355 | |
| parent | e34922c1f3df003aeebea54404d8ec3c142ccafa (diff) | |
Replace rather than augment PKG_CONFIG_PATH when it is empty
| -rw-r--r-- | jhbuildrc.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jhbuildrc.include b/jhbuildrc.include index ee60579..e6aac19 100644 --- a/jhbuildrc.include +++ b/jhbuildrc.include @@ -184,7 +184,7 @@ prefix = os.path.join('/jhbuild', os.environ['HOST'], 'install') # os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal') -if cross_target: +if cross_target or not 'PKG_CONFIG_PATH' in os.environ: os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') + ':' + os.path.join(prefix, 'share', 'pkgconfig') else: # if not cross compiling, just augment rather than replace PKG_CONFIG_PATH |