From 0ec71131121123382eebdaded13246a9d26ef7aa Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 1 Dec 2016 23:27:23 +0100 Subject: [PATCH] src/wscript_build: honor --includedir --- src/wscript_build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wscript_build b/src/wscript_build index c55d5f26..62a8b705 100644 --- a/src/wscript_build +++ b/src/wscript_build @@ -26,7 +26,11 @@ elif ctx.env['DEST_OS'] in ['win32', 'win64']: build_features = ['cstlib', 'cshlib'] elif ctx.env['DEST_OS'] in ['emscripten']: build_features = ['cstlib'] -else: #linux, darwin, android, mingw, ... +elif '--static' in ctx.env['LDFLAGS'] or '--static' in ctx.env['LINKFLAGS']: + # static in cflags, ... + build_features = ['cstlib'] +else: + # linux, darwin, android, mingw, ... build_features = ['cstlib', 'cshlib'] # also install static lib @@ -41,6 +45,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) -- 2.11.0