From 0dc450424ce8c66628b22790656fc4f3577f80e7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 19:39:09 +0000
Subject: Haiku has no libm


diff --git a/examples/wscript_build b/examples/wscript_build
index db5fed6..3f573cc 100644
--- a/examples/wscript_build
+++ b/examples/wscript_build
@@ -17,7 +17,7 @@ bld(features = 'c',
 for source_file in programs_source:
     bld(features = 'c cprogram',
             includes = '../src',
-            lib = 'm',
+            lib = '',
             use = ['aubio', 'utilsio'],
             source = source_file,
             target = str(source_file).split('.')[0]
diff --git a/src/wscript_build b/src/wscript_build
index 94b2062..2b9b60d 100644
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -15,7 +15,7 @@ ctx(features = 'c',
         source = source,
         includes = ['.'],
         uselib = uselib,
-        lib = 'm',
+        lib = '',
         target = 'lib_objects')
 
 # build libaubio.so (cshlib) and/or libaubio.a (cstlib)
@@ -29,7 +29,7 @@ else: #linux, darwin, android, mingw, ...
 for target in build_features:
     ctx(features = 'c ' + target,
             use = ['lib_objects'],
-            lib = 'm',
+            lib = '',
             target = 'aubio',
             install_path = '${PREFIX}/lib',
             vnum = ctx.env['LIB_VERSION'])
diff --git a/tests/wscript_build b/tests/wscript_build
index 04bbf9a..8a8c625 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -6,7 +6,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'):
     extra_source = []
 
     bld(features = 'c cprogram test',
-            lib = 'm',
+            lib = '',
             uselib = uselib,
             source = [target_name] + extra_source,
             target = str(target_name).split('.')[0],
-- 
1.8.3.4


From 3d07ca19c7c3ec7044417c062553d3ea02375d17 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 23:15:04 +0000
Subject: fix headers installation


diff --git a/src/wscript_build b/src/wscript_build
index 2b9b60d..194345d 100644
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -35,6 +35,6 @@ for target in build_features:
             vnum = ctx.env['LIB_VERSION'])
 
 # install headers, except _priv.h ones
-ctx.install_files('${PREFIX}/include/aubio/',
+ctx.install_files('${INCLUDEDIR}/aubio/',
         ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
         relative_trick=True)
-- 
1.8.3.4

