X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=headless%2Fwscript;h=80296a10de2a5c8e7a61c267c0532a3e28bb2043;hb=7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79;hp=5001bea77c5d47594135388e85a09960146ca08f;hpb=495c0de4ac2e5292a2ebaf276e57cb30fea414db;p=ardour.git

diff --git a/headless/wscript b/headless/wscript
index 5001bea77c..80296a10de 100644
--- a/headless/wscript
+++ b/headless/wscript
@@ -32,13 +32,13 @@ def build(bld):
     VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
     if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
         return
-    
+
     # just the normal executable version of the GTK GUI
     obj = bld (features = 'cxx c cxxprogram')
     # this program does not do the whole hidden symbols thing
     obj.cxxflags = [ '-fvisibility=default' ]
     obj.source    = hardour_sources
-    obj.target = 'hardour-' + bld.env['VERSION']
+    obj.target = 'hardour-' + str (bld.env['VERSION'])
     obj.includes = ['.']
 
     # at this point, "obj" refers to either the normal native executable
@@ -47,18 +47,18 @@ def build(bld):
     obj.use      = [ 'libpbd',
                      'libardour',
                      'libardour_cp',
-                     'libtimecode',
+                     'libtemporal',
                      'libmidipp',
                      ]
 
     obj.defines = [
-        'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+        'VERSIONSTRING="' + str(bld.env['VERSION']) + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         ]
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.install_path = bld.env['LIBDIR']
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '
@@ -81,17 +81,17 @@ def build(bld):
             'INSTALL_PREFIX' : bld.env['PREFIX'],
             'LIBDIR'         : os.path.normpath(bld.env['LIBDIR']),
             'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
-            'SYSCONFDIR'     : os.path.normpath(bld.env['SYSCONFDIR']),
+            'CONFDIR'        : os.path.normpath(bld.env['CONFDIR']),
             'LIBS'           : 'build/libs',
             'VERSION'        : bld.env['VERSION'],
-            'EXECUTABLE'     : 'build/headless/hardour-' + bld.env['VERSION']
+            'EXECUTABLE'     : 'build/headless/hardour-' + str(bld.env['VERSION'])
     }
 
     def set_subst_dict(obj, dict):
         for i in dict:
             setattr(obj, i, dict[i])
 
-    obj              = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
+    obj              = bld(features = 'subst')
     obj.source       = 'hardev_common.sh.in'
     obj.target       = 'hardev_common_waf.sh'
     obj.chmod        = Utils.O755