diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-25 09:38:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-25 09:38:21 +0100 |
| commit | ad4ab402b8548481d0dcda94d7a08c07f4f0750f (patch) | |
| tree | 01a4f6ac10cd560335d9933f7317b4d50b6b2e4b /wscript | |
| parent | a1201ace8a1d5d3e0a9eca769cb9e0a12bf32693 (diff) | |
| parent | 637610a095ad8e25fc058b06b77ffc8d3bb77ceb (diff) | |
Merge.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.7devel' +VERSION = '2.1.9devel' def options(opt): opt.load('compiler_cxx') @@ -404,7 +404,8 @@ def build(bld): 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.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post) |