From a72a4b28a07e32ce4fd03aba011f061a05261e1d Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 28 Nov 2014 22:25:54 +0100 Subject: [PATCH] build: don't install some files if only libmpv is built encoding-profiles.conf can be used by libmpv, but it won't load it from this path by default, so exclude it as well. Fixes #1293. --- wscript_build.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/wscript_build.py b/wscript_build.py index 6120c53813..169f9f5059 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -535,19 +535,21 @@ def build(ctx): if ctx.dependency_satisfied('pdf-build'): _build_pdf(ctx) - if ctx.dependency_satisfied('zsh-comp'): - ctx.zshcomp(target = "etc/_mpv") + if ctx.dependency_satisfied('cplayer'): + + if ctx.dependency_satisfied('zsh-comp'): + ctx.zshcomp(target = "etc/_mpv") + ctx.install_files( + ctx.env.ZSHDIR, + ['etc/_mpv']) + ctx.install_files( - ctx.env.ZSHDIR, - ['etc/_mpv']) + ctx.env.DATADIR + '/applications', + ['etc/mpv.desktop'] ) - ctx.install_files( - ctx.env.DATADIR + '/applications', - ['etc/mpv.desktop'] ) + ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] ) - ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] ) - - for size in '16x16 32x32 64x64'.split(): - ctx.install_as( - ctx.env.DATADIR + '/icons/hicolor/' + size + '/apps/mpv.png', - 'etc/mpv-icon-8bit-' + size + '.png') + for size in '16x16 32x32 64x64'.split(): + ctx.install_as( + ctx.env.DATADIR + '/icons/hicolor/' + size + '/apps/mpv.png', + 'etc/mpv-icon-8bit-' + size + '.png')