Use --destdir instead of --install-prefix in wscript.

diff --git a/cscript b/cscript
index 9d4eab853b4459952b973ef4eb69d1c50ff8c501..de26ef5f1039226d2b51bf6468f842669df9ac04 100644 (file)
--- a/cscript
+++ b/cscript
@@ -335,7 +335,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
-    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' %
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --destdir=/usr %s' %
           (target.directory, target.directory, configure_options(target, options)), file=f)
     print('./waf', file=f)
     print('%install', file=f)

diff --git a/wscript b/wscript
index 867fb5f824266556833d1ac049613df465dca00e..016feaa66c22fa5473dd5b8425333f3e61cf16dc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -57,7 +57,6 @@ def options(opt):
     opt.add_option('--enable-debug',      action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
     opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
-    opt.add_option('--install-prefix',                         default=None,  help='prefix of where DCP-o-matic will be installed')
     opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile for Windows')
     opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64')
     opt.add_option('--static-dcpomatic',  action='store_true', default=False, help='link to components of DCP-o-matic statically')
@@ -93,10 +92,10 @@ 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.install_prefix is None:
+    if conf.options.destdir is None:
         conf.env.INSTALL_PREFIX = conf.env.PREFIX
     else:
-        conf.env.INSTALL_PREFIX = conf.options.install_prefix
+        conf.env.INSTALL_PREFIX = conf.options.destdir
 
     # Common CXXFLAGS
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',