From: Carl Hetherington <cth@carlh.net>
Date: Fri, 1 Mar 2013 17:30:53 +0000 (+0000)
Subject: Merge branch 'master' of /home/carl/git/dvdomatic
X-Git-Tag: v2.0.48~1337^2~595^2~8
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=5121d13ded51a70169f5b5d649067c9b26456705;hp=-c;p=dcpomatic.git

Merge branch 'master' of /home/carl/git/dvdomatic
---

5121d13ded51a70169f5b5d649067c9b26456705
diff --combined wscript
index 4b81814a7,019858100..3f0d9f1df
--- a/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
 -VERSION = '0.75beta1'
 +VERSION = '0.76pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -21,7 -21,9 +21,9 @@@ def configure(conf)
      if conf.options.target_windows:
          conf.load('winres')
  
-     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra'])
+     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
+                                        '-Wall', '-Wno-attributes', '-Wextra',
+                                        '-DLOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']])
  
      if conf.options.target_windows:
          conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
@@@ -198,6 -200,15 +200,15 @@@
                               define_name = 'HAVE_BUFFERSRC_H',
                               mandatory = False)
  
+     conf.find_program('msgfmt', var='MSGFMT')
+     
+     datadir = conf.env.DATADIR
+     if not datadir:
+         datadir = os.path.join(conf.env.PREFIX, 'share')
+     
+     conf.define('LOCALEDIR', os.path.join(datadir, 'locale'))
+     conf.define('DATADIR', datadir)
+ 
      conf.recurse('src')
      conf.recurse('test')
  
@@@ -253,3 -264,6 +264,6 @@@ def create_version_cc(version)
  def post(ctx):
      if ctx.cmd == 'install':
          ctx.exec_command('/sbin/ldconfig')
+ 
+ def pot(bld):
+     bld.recurse('src')