From e1d59a67788fd40ae5319a664bb36306b65de70a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 30 Sep 2008 18:20:57 +0000 Subject: Working ingen when built/installed via waf. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1554 a436a847-0d15-0410-975c-d299462d15a1 --- src/module/Module.cpp | 9 +++++++-- src/module/wscript | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/module') diff --git a/src/module/Module.cpp b/src/module/Module.cpp index 8d1399b1..76f9baac 100644 --- a/src/module/Module.cpp +++ b/src/module/Module.cpp @@ -77,9 +77,14 @@ load_module(const string& name) if (*module) { cerr << "Loaded module \"" << name << "\" from " << INGEN_MODULE_DIR << endl; return SharedPtr(module); + } else if (!module_path_found) { + cerr << "Unable to find module " << name + << " (" << Glib::Module::get_last_error() << ")" << endl; + return SharedPtr(); } else { - cerr << "Unable to load module \"" << name << "\", is Ingen installed?" << endl - << "Use ./ingen.dev to run from the source tree." << endl; + cerr << "Unable to load module " << name << " from " << module_path + << " (" << Glib::Module::get_last_error() << ")" << endl; + cerr << "Is Ingen installed? Use ./ingen.dev to run from the source tree." << endl; return SharedPtr(); } } diff --git a/src/module/wscript b/src/module/wscript index fb9f9c93..bdcbebc9 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -2,7 +2,7 @@ import Params def build(bld): - dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib/ingen' + dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib' obj = bld.create_obj('cpp', 'shlib') obj.source = ''' Module.cpp -- cgit v1.2.1