summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/client/wscript2
-rw-r--r--src/engine/wscript12
-rw-r--r--src/gui/wscript2
-rw-r--r--src/serialisation/wscript2
-rw-r--r--wscript6
5 files changed, 11 insertions, 13 deletions
diff --git a/src/client/wscript b/src/client/wscript
index 749d9ec7..b1005c16 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -34,7 +34,7 @@ def build(bld):
obj.export_incdirs = ['.']
obj.name = 'libingen_client'
obj.target = 'ingen_client'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_shared'
autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP LIBLO SOUP')
diff --git a/src/engine/wscript b/src/engine/wscript
index 2d7b8cef..a37b69b3 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -63,14 +63,14 @@ def build(bld):
core_source += ' LADSPAPlugin.cpp LADSPANode.cpp '
if bld.env['HAVE_SLV2'] == 1:
core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
-
+
obj = bld.new_task_gen('cxx', 'shlib')
obj.source = core_source
obj.export_incdirs = ['.']
obj.includes = ['.', '..', '../..', '../common']
obj.name = 'libingen_engine'
obj.target = 'ingen_engine'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_shared'
core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
autowaf.use_lib(bld, obj, core_libs)
@@ -87,7 +87,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common', '../engine']
obj.name = 'libingen_http'
obj.target = 'ingen_http'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
autowaf.use_lib(bld, obj, core_libs + ' SOUP')
if bld.env['HAVE_LIBLO'] == 1:
@@ -103,7 +103,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common', '../engine']
obj.name = 'libingen_osc'
obj.target = 'ingen_osc'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
if bld.env['HAVE_JACK'] == 1:
@@ -113,7 +113,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common', '../engine']
obj.name = 'libingen_jack'
obj.target = 'ingen_jack'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_engine'
autowaf.use_lib(bld, obj, core_libs + ' JACK')
@@ -124,7 +124,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common']
obj.name = 'libingen_lv2'
obj.target = 'ingen_lv2'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_shared libingen_module'
obj.add_objects = 'libingen_engine'
autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/gui/wscript b/src/gui/wscript
index a49baf70..fb9be2f8 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -48,7 +48,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common', '../client', '../module']
obj.name = 'libingen_gui'
obj.target = 'ingen_gui'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_shared libingen_module libingen_client libingen_serialisation'
autowaf.use_lib(bld, obj, '''
CURL
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index b2639dc0..92f5ef3d 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -15,7 +15,7 @@ def build(bld):
obj.includes = ['.', '..', '../..', '../common']
obj.name = 'libingen_serialisation'
obj.target = 'ingen_serialisation'
- obj.install_path = '${LIBDIR}/ingen'
+ obj.install_path = '${LIBDIR}'
obj.uselib_local = 'libingen_shared'
autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM')
diff --git a/wscript b/wscript
index 06c6504b..f881b935 100644
--- a/wscript
+++ b/wscript
@@ -67,13 +67,11 @@ def configure(conf):
if conf.env['BUNDLE']:
conf.define('INGEN_DATA_DIR', os.path.join(
conf.env['DATADIRNAME'], 'ingen'))
- conf.define('INGEN_MODULE_DIR', os.path.join(
- conf.env['LIBDIRNAME'], 'ingen'))
+ conf.define('INGEN_MODULE_DIR', conf.env['LIBDIRNAME'])
else:
conf.define('INGEN_DATA_DIR', os.path.join(
conf.env['DATADIR'], 'ingen'))
- conf.define('INGEN_MODULE_DIR', os.path.join(
- conf.env['LIBDIR'], 'ingen'))
+ conf.define('INGEN_MODULE_DIR', conf.env['LIBDIR'])
if Options.options.log_debug:
conf.define('LOG_DEBUG', 1)