X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=b7ea7de6ca054d1ea171223ddbf81db2e42008b3;hp=4b3164f71e16d6101133c96c504a0318f630eb54;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=8aa97c043d73e0c6c8bc484a307b944702c7d3dd

diff --git a/wscript b/wscript
index 4b3164f71..b7ea7de6c 100644
--- a/wscript
+++ b/wscript
@@ -92,8 +92,8 @@ def configure(conf):
     conf.env.DEBUG = conf.options.enable_debug
     conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic
     conf.env.ENABLE_DISK = conf.options.enable_disk
-    if conf.options.destdir is None:
-        conf.env.INSTALL_PREFIX = conf.env.PREFIX
+    if conf.options.destdir == '':
+        conf.env.INSTALL_PREFIX = conf.options.prefix
     else:
         conf.env.INSTALL_PREFIX = conf.options.destdir
 
@@ -276,37 +276,6 @@ def configure(conf):
     # leqm_nrt
     conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True)
 
-    # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not
-    conf.check_cxx(fragment="""
-                            #include <cairomm/cairomm.h>
-                            int main(void) {
-                                Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n
-                                return 0; }\n
-                            """,
-                       mandatory=False,
-                       msg='Checking for format_stride_for_width',
-                       okmsg='yes',
-                       includes=conf.env['INCLUDES_CAIROMM'],
-                       uselib='CAIROMM',
-                       define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH')
-
-    # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not
-    conf.check_cxx(fragment="""
-                            #include <pangomm.h>
-                            int main(void) {
-                                Cairo::RefPtr<Cairo::Context> context;
-                                Glib::RefPtr<Pango::Layout> layout;
-                                layout->show_in_cairo_context (context);
-                                return 0; }\n
-                            """,
-                       mandatory=False,
-                       msg='Checking for show_in_cairo_context',
-                       okmsg='yes',
-                       includes=conf.env['INCLUDES_PANGOMM'],
-                       uselib='PANGOMM',
-                       define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT')
-
-
     # libcxml
     if conf.options.static_cxml:
         conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True)
@@ -697,16 +666,10 @@ 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 executables
-        for e in ['dcpomatic2_uuid', 'dcpomatic2_disk_writer']:
-            # I can't find anything which tells me where things have been installed to,
-            # so here's some nasty hacks to guess.
-            debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/%s' % e)
-            prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s' % e)
-            if os.path.exists(debian):
-                os.chmod(debian, 0o4755)
-            if os.path.exists(prefix):
-                os.chmod(prefix, 0o4755)
+        # 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')