diff options
| author | David Robillard <d@drobilla.net> | 2012-01-14 19:35:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-01-14 19:35:24 +0000 |
| commit | d4fad3ec5cf509406cbfcf379c828d77b0e67d7c (patch) | |
| tree | 9e4d53550ace8481045a28e5559b0def4816f0ff | |
| parent | ae3f0b93049194bdefefd6226d5080cf28f5d67a (diff) | |
| download | ingen-d4fad3ec5cf509406cbfcf379c828d77b0e67d7c.tar.gz ingen-d4fad3ec5cf509406cbfcf379c828d77b0e67d7c.tar.bz2 ingen-d4fad3ec5cf509406cbfcf379c828d77b0e67d7c.zip | |
Fix broken link to engine library in saved bundles (fix #806).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3944 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/serialisation/Serialiser.cpp | 2 | ||||
| -rw-r--r-- | src/server/wscript | 15 | ||||
| -rw-r--r-- | wscript | 9 |
3 files changed, 15 insertions, 11 deletions
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 84e05022..faf95c09 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -166,7 +166,7 @@ Serialiser::Impl::write_manifest(const std::string& bundle_path, Sord::Curie(world, "lv2:binary"), Sord::URI(world, binary_path)); - symlink(Glib::Module::build_path(INGEN_MODULE_DIR, "ingen_lv2").c_str(), + symlink(Glib::Module::build_path(INGEN_BUNDLE_DIR, "ingen_lv2").c_str(), Glib::Module::build_path(bundle_path, "ingen_lv2").c_str()); finish(); diff --git a/src/server/wscript b/src/server/wscript index 04731313..2a5e687f 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -76,12 +76,11 @@ def build(bld): autowaf.use_lib(bld, obj, core_libs + ' JACK') # Ingen LV2 wrapper - obj = bld(features = 'cxx cxxshlib', - source = ' ingen_lv2.cpp ', - includes = ['.', '../..', '../../include'], - name = 'libingen_lv2', - target = 'ingen_lv2', - #install_path = '${LIBDIR}', - install_path = '${LV2DIR}/ingen.lv2/', - use = 'libingen_server libingen_shared') + obj = bld(features = 'cxx cxxshlib', + source = ' ingen_lv2.cpp ', + includes = ['.', '../..', '../../include'], + name = 'libingen_lv2', + target = 'ingen_lv2', + install_path = '${LV2DIR}/ingen.lv2/', + use = 'libingen_server libingen_shared') autowaf.use_lib(bld, obj, core_libs) @@ -104,8 +104,12 @@ def configure(conf): if conf.is_defined('HAVE_JACK'): autowaf.define(conf, 'HAVE_JACK_MIDI', 1) - autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIR'], 'ingen')) - autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIR']) + autowaf.define(conf, 'INGEN_DATA_DIR', + os.path.join(conf.env['DATADIR'], 'ingen')) + autowaf.define(conf, 'INGEN_MODULE_DIR', + conf.env['LIBDIR']) + autowaf.define(conf, 'INGEN_BUNDLE_DIR', + os.path.join(conf.env['LV2DIR'], 'ingen.lv2')) if Options.options.log_debug: autowaf.define(conf, 'RAUL_LOG_DEBUG', 1) @@ -122,6 +126,7 @@ def configure(conf): autowaf.display_msg(conf, "HTTP", conf.is_defined('HAVE_SOUP')) autowaf.display_msg(conf, "LV2", conf.is_defined('HAVE_LILV')) autowaf.display_msg(conf, "GUI", str(conf.env['INGEN_BUILD_GUI'] == 1)) + autowaf.display_msg(conf, "LV2 Bundle", conf.env['INGEN_BUNDLE_DIR']) autowaf.display_msg(conf, "HTML plugin documentation support", conf.is_defined('HAVE_WEBKIT')) print('') |