diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-18 19:55:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-18 19:55:54 +0300 |
| commit | 06ce41b5259e2d9e16cfc1e900f0e4bc44f37e8f (patch) | |
| tree | 2eddadbba66505f5242886052f48a6f24016cd62 | |
| parent | b1077dded73b31fbdac5908eac289edc6aad0f86 (diff) | |
| parent | f64c97869530a2b010f44731a0922b6ae4b9dd5d (diff) | |
| download | meson-06ce41b5259e2d9e16cfc1e900f0e4bc44f37e8f.zip meson-06ce41b5259e2d9e16cfc1e900f0e4bc44f37e8f.tar.gz meson-06ce41b5259e2d9e16cfc1e900f0e4bc44f37e8f.tar.bz2 | |
Merge pull request #601 from Ippytraxx/master
Add custom_install_dir to ld path in pkgconfig module
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/authors.txt b/authors.txt index f633cb2..de12676 100644 --- a/authors.txt +++ b/authors.txt @@ -37,3 +37,4 @@ Emmanuele Bassi Martin Hostettler Sam Thursfield Noam Meltzer +Vincent Szolnoky diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index fe5ca45..6ee558b 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -43,6 +43,8 @@ class PkgConfigModule: ofile.write('Libraries.private: {}\n'.format(' '.join(priv_libs))) ofile.write('Libs: -L${libdir} ') for l in libraries: + if l.custom_install_dir: + ofile.write('-L${prefix}/%s ' % l.custom_install_dir) ofile.write('-l%s ' % l.name) ofile.write('\n') ofile.write('CFlags: ') |