26d4079c0a1eb010b0909e8f046f04381408b6f3 from master; half-hearted --dump option...

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index f035de67adab9c22e052c497a0aa268070b45f2e..98516102c37bec716ac896620f5cbcaa63cd9339 100644 (file)
--- a/wscript
+++ b/wscript
@@ -25,7 +25,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.46devel'
+VERSION = '2.0.47devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -135,9 +135,8 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
-
-    if not conf.env.DISABLE_GUI:
-        conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+        if not conf.env.DISABLE_GUI:
+            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
     # OSX
     if conf.env.TARGET_OSX:
@@ -401,7 +400,7 @@ 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')