Updated pl_PL translation from Michał Tomaszewski

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index cfc47d6cca22031a147f79ae1ff21600f166673c..239f45bf805b3b408dfb48a9737889321185f0b1 100644 (file)
--- a/wscript
+++ b/wscript
@@ -47,7 +47,7 @@ if not isinstance(this_version, str):
 if not isinstance(last_version, str):
     last_version = last_version.decode('utf-8')
 
-if this_version == '':
+if this_version == '' or this_version == 'merged-to-main':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
     VERSION = this_version[1:].strip()
@@ -664,10 +664,6 @@ def create_version_cc(version, cxx_flags):
 def post(ctx):
     if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
-        # setuid root executable
-        exe = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s/dcpomatic2_disk_writer')
-        if os.path.exists(exe):
-            os.chmod(exe, 0o4755)
 
 def pot(bld):
     bld.recurse('src')