shorten Metrum & Tempo label

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 8d46b1b85780c5c69a1582583f2ad912d62f8e88..c27c433e048c13fe8c00318d418e06578a3f1d0d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -471,7 +471,8 @@ def configure(conf):
     # where we need to pick it up from the GTK dependency stack.
     #
     user_gtk_root = os.path.expanduser ('~/gtk/inst')
-    if not os.path.isfile ('/usr/include/libintl.h') or os.getenv('PKG_CONFIG_PATH').find (user_gtk_root) >= 0:
+    pkg_config_path = os.getenv('PKG_CONFIG_PATH')
+    if not os.path.isfile ('/usr/include/libintl.h') or (pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0):
         # XXXX hack hack hack
         prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
         preflib = ''.join ([ '-L', user_gtk_root + '/lib'])
@@ -484,7 +485,7 @@ def configure(conf):
         autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no')
 
     user_ardour_root = os.path.expanduser ('~/a3/inst')
-    if os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0:
+    if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0:
         # XXXX hack hack hack
         prefinclude = ''.join ([ '-I', user_ardour_root + '/include'])
         preflib = ''.join ([ '-L', user_ardour_root + '/lib'])
@@ -728,28 +729,7 @@ def build(bld):
     for i in children:
         bld.recurse(i)
 
-    # ideally, we'd like to use the OS-provided MIDI API
-    # for default ports. that doesn't work on at least
-    # Fedora (Nov 9th, 2009) so use JACK MIDI on linux.
-
-    if sys.platform == 'darwin':
-        rc_subst_dict = {
-                'MIDITAG'    : 'control',
-                'MIDITYPE'   : 'coremidi',
-                'JACK_INPUT' : 'auditioner'
-                }
-    else:
-        rc_subst_dict = {
-                'MIDITAG'    : 'control',
-                'MIDITYPE'   : 'jack',
-                'JACK_INPUT' : 'auditioner'
-                }
-
-    obj              = bld(features = 'subst')
-    obj.source       = 'ardour.rc.in'
-    obj.target       = 'ardour_system.rc'
-    obj.dict         = rc_subst_dict
-    obj.install_path = '${SYSCONFDIR}/ardour3'
+    bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc')
 
 def i18n(bld):
     bld.recurse (i18n_children)