From cd4ad2186dba563db5b803963a86501f0b1e60f9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 11:53:57 +0100 Subject: More centos build fixes. --- platform/linux/wscript | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'platform/linux/wscript') diff --git a/platform/linux/wscript b/platform/linux/wscript index fe6f4e2db..3aab4f7fb 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -1,25 +1,30 @@ def build(bld): - d = { 'INSTALL_PREFIX' : bld.env.INSTALL_PREFIX } - d = { 'VERSION' : bld.env.VERSION } - obj = bld(features='subst') obj.source = 'dcpomatic.desktop.in' obj.target = 'dcpomatic.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_batch.desktop.in' obj.target = 'dcpomatic_batch.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_server.desktop.in' obj.target = 'dcpomatic_server.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic.spec.in' obj.target = 'dcpomatic.spec' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + if bld.env.TARGET_CENTOS_6: + obj.CENTOS_VERSION = '6' + elif bld.env.TARGET_CENTOS_7: + obj.CENTOS_VERSION = '7' bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop']) -- cgit v1.2.3