X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=00665bbacfdf7469a3276360bec21c4bb6b3f4ae;hb=refs%2Fheads%2Fplaylist;hp=a333f95d891255d268d841487669813502a64c2a;hpb=99c1d1f247343b884af0b51389311484ed265d3b;p=dcpomatic.git

diff --git a/wscript b/wscript
index a333f95d8..00665bbac 100644
--- a/wscript
+++ b/wscript
@@ -123,6 +123,8 @@ def configure(conf):
             # I tried and failed to ignore these with _Pragma
             conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
         have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+        # Most gccs still give these warnings from boost::optional
+        conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
     else:
         have_c11 = False
 
@@ -196,7 +198,7 @@ def configure(conf):
     if conf.env.TARGET_LINUX:
         conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
         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', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
         conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
         conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')