diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
| commit | 821908d2773d0ba9dd76126f1dbbb9759ba7c4ff (patch) | |
| tree | 8bef42bee1061ae474a9127b5e77bdcf5504dc71 /wscript | |
| parent | 16fee74d60a2da1beb11e3aa4f3305e68978d88a (diff) | |
Make 2.0 branch parallel installable with 1.x.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -223,7 +223,7 @@ def configure(conf): if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX') conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) - conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['INSTALL_PREFIX']) + conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -361,10 +361,10 @@ def build(bld): bld.recurse('platform/osx') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r) + bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r) if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png') bld.add_post_fun(post) |