projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
platform
/
linux
/
wscript
diff --git
a/platform/linux/wscript
b/platform/linux/wscript
index fe6f4e2db10a9a77aa16e4bb3d95463479097790..336c1bcb002aefee8c18fe4a478832e3cd186336 100644
(file)
--- a/
platform/linux/wscript
+++ b/
platform/linux/wscript
@@
-1,25
+1,30
@@
def build(bld):
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 = bld(features='subst')
obj.source = 'dcpomatic.desktop.in'
- obj.target = 'dcpomatic.desktop'
- obj.dict = d
+ obj.target = 'dcpomatic2.desktop'
+ obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+ obj.VERSION = bld.env.VERSION
obj = bld(features='subst')
obj.source = 'dcpomatic_batch.desktop.in'
obj = bld(features='subst')
obj.source = 'dcpomatic_batch.desktop.in'
- obj.target = 'dcpomatic_batch.desktop'
- obj.dict = d
+ obj.target = 'dcpomatic2_batch.desktop'
+ obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+ obj.VERSION = bld.env.VERSION
obj = bld(features='subst')
obj.source = 'dcpomatic_server.desktop.in'
obj = bld(features='subst')
obj.source = 'dcpomatic_server.desktop.in'
- obj.target = 'dcpomatic_server.desktop'
- obj.dict = d
+ obj.target = 'dcpomatic2_server.desktop'
+ obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+ obj.VERSION = bld.env.VERSION
obj = bld(features='subst')
obj.source = 'dcpomatic.spec.in'
obj = bld(features='subst')
obj.source = 'dcpomatic.spec.in'
- obj.target = 'dcpomatic.spec'
- obj.dict = d
+ obj.target = 'dcpomatic2.spec'
+ 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'])
+ bld.install_files('${PREFIX}/share/applications', ['dcpomatic
2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2
_server.desktop'])