From 5e09c3e596c1b0860a996cf8f6023b43d5286a4a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 20 Oct 2008 00:25:32 +0000 Subject: Actually use installation location variables for everything. Add ./waf configure --build which builds a (soon-to-be) relocatable independent bundle with all data/progs/libs in it (OSX bundle directory structure, should be possible to make a 'real' OSX bundle out of this...). Fix include paths to use "" and definitely build against local versions of libraries. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1689 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 0570732d..cee783a7 100644 --- a/wscript +++ b/wscript @@ -16,8 +16,6 @@ blddir = 'build' def set_options(opt): autowaf.set_options(opt) - opt.tool_options('compiler_cc') - opt.tool_options('compiler_cxx') opt.add_option('--data-dir', type='string', dest='datadir', help="Ingen data install directory [Default: PREFIX/share/ingen]") opt.add_option('--module-dir', type='string', dest='moduledir', @@ -56,6 +54,7 @@ def configure(conf): conf.define('BUILD_GUI', build_gui) conf.define('HAVE_JACK_MIDI', conf.env['HAVE_JACK'] == 1) conf.define('INGEN_DATA_DIR', os.path.normpath(conf.env['DATADIR'] + 'ingen')) + conf.define('INGEN_MODULE_DIR', os.path.normpath(conf.env['LIBDIR'] + 'ingen')) conf.write_config_header('config.h') autowaf.print_summary(conf) @@ -88,5 +87,5 @@ def build(bld): # Documentation autowaf.build_dox(bld, 'INGEN', INGEN_VERSION, srcdir, blddir) - install_files('PREFIX', 'share/doc/ingen', blddir + '/default/doc/html/*') + install_files('HTMLDIR', '', blddir + '/default/doc/html/*') -- cgit v1.2.1