X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fwscript;h=fd3e9552bee7eebe042be4704fa79f95b2fc268a;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=2dc546a5d7bded0bdb3566c8417f1750e1bb79a9;hpb=b9185d2c07c77eccf3679ac99f6b69f8fdd79c48;p=ardour.git

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 2dc546a5d7..fd3e9552be 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -42,17 +42,15 @@ def build(bld):
             types.cc
     '''
     obj.export_includes = ['./mackie']
-    obj.defines     = [ 'PACKAGE="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      = [ 'LIBCONTROLCP_EXPORTS' ]
-    obj.defines     += [ 'PACKAGE="libardour_mcp"' ]
     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()