From 0081d181e93d8d78cd29a3ce81304b4f5676ef0b Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 29 Jan 2020 23:17:00 +0000 Subject: [PATCH] Allow to costumize pkg-config dir via --pkgconfigdir Signed-off-by: falkTX --- common/wscript | 2 +- wscript | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/wscript b/common/wscript index f81a285c..c2e2c4af 100644 --- a/common/wscript +++ b/common/wscript @@ -408,7 +408,7 @@ def build(bld): features = 'subst_pc', source = '../jack.pc.in', target = 'jack.pc', - install_path = '${LIBDIR}/pkgconfig/', + install_path = '${PKGCONFDIR}', INCLUDEDIR = os.path.normpath(bld.env['PREFIX'] + '/include'), SERVERLIB = serverlib.target, ) diff --git a/wscript b/wscript index 3a187d8f..2dcc8173 100644 --- a/wscript +++ b/wscript @@ -61,6 +61,7 @@ def options(opt): opt.add_option('--htmldir', type='string', default=None, help='HTML documentation directory [Default: /share/jack-audio-connection-kit/reference/html/') opt.add_option('--libdir', type='string', help='Library directory [Default: /lib]') opt.add_option('--libdir32', type='string', help='32bit Library directory [Default: /lib32]') + opt.add_option('--pkgconfigdir', type='string', help='pkg-config file directory [Default: /pkgconfig]') opt.add_option('--mandir', type='string', help='Manpage directory [Default: /share/man/man1]') # options affecting binaries @@ -324,6 +325,11 @@ def configure(conf): else: conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib' + if Options.options.pkgconfigdir: + conf.env['PKGCONFDIR'] = Options.options.pkgconfigdir + else: + conf.env['PKGCONFDIR'] = conf.env['LIBDIR'] + '/pkgconfig' + if Options.options.mandir: conf.env['MANDIR'] = Options.options.mandir else: