From 0f2bb5720bc2a4fe20d4a3659dc011d34b64d5a0 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 2 Oct 2022 22:28:53 +0300 Subject: [PATCH] wscript: respect --libdir argument with packaging enabled. Fix a typo in --disable-soft description --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index c3219d58..ac122dbe 100644 --- a/wscript +++ b/wscript @@ -106,7 +106,7 @@ def options(opt): help = 'disable opengl renderer [default: %default]') grp.add_option('--disable-soft', action='store_false', dest='SOFT', default=True, - help = 'disable opengl renderer [default: %default]') + help = 'disable soft renderer [default: %default]') grp = opt.add_option_group('Utilities options') @@ -351,7 +351,7 @@ int main(int argc, char **argv) { strcasestr(argv[1], argv[2]); return 0; }''' # indicate if we are packaging for Linux/BSD if conf.options.PACKAGING: - conf.env.LIBDIR = conf.env.BINDIR = '${PREFIX}/lib/xash3d' + conf.env.LIBDIR = conf.env.BINDIR = conf.env.LIBDIR + '/xash3d' conf.env.SHAREDIR = '${PREFIX}/share/xash3d' else: if sys.platform != 'win32' and not conf.env.DEST_OS == 'android':