Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / libs / surfaces / mackie / wscript

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index e097772e7a46ec3536a781aedb112a14dce5a84a..fd3e9552bee7eebe042be4704fa79f95b2fc268a 100644 (file)
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -42,16 +42,15 @@ def build(bld):
             types.cc
     '''
     obj.export_includes = ['./mackie']
-    obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
-    # need ../libs because some GTK2 header files require stuff there
-    obj.includes     = ['.', '../libs']
+    obj.defines      = [ 'PACKAGE="ardour_mackie"' ]
+    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
+    obj.includes     = [ '.' ]
     obj.name         = 'libardour_mcp'
-    obj.defines      = [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.target       = 'ardour_mcp'
     obj.uselib       = 'GTKMM'
     obj.use          = 'libardour libardour_cp libgtkmm2ext'
     obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()