From 8ea17322e4624d6f63964b525326c41e133367e1 Mon Sep 17 00:00:00 2001 From: Ippytraxx Date: Fri, 17 Jun 2016 10:08:59 +0200 Subject: [PATCH 1/2] Add custom_install_dir to ld path in pkgconfig module --- mesonbuild/modules/pkgconfig.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index fe5ca45dc..6ee558bae 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: ') From f64c97869530a2b010f44731a0922b6ae4b9dd5d Mon Sep 17 00:00:00 2001 From: ippytraxx Date: Sat, 18 Jun 2016 15:23:42 +0200 Subject: [PATCH 2/2] Add myself to authors.txt --- authors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/authors.txt b/authors.txt index f633cb22a..de1267643 100644 --- a/authors.txt +++ b/authors.txt @@ -37,3 +37,4 @@ Emmanuele Bassi Martin Hostettler Sam Thursfield Noam Meltzer +Vincent Szolnoky