From 7617b3a744a11aeb4840339ca43e1cfb2d3358b7 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/raul@1689 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index cb11573..1eafdc4 100644 --- a/wscript +++ b/wscript @@ -25,8 +25,6 @@ blddir = 'build' def set_options(opt): autowaf.set_options(opt) - opt.tool_options('compiler_cc') - opt.tool_options('compiler_cxx') def configure(conf): autowaf.configure(conf) @@ -37,8 +35,8 @@ def configure(conf): def build(bld): # Headers - install_files('PREFIX', 'include/raul', 'raul/*.hpp') - install_files('PREFIX', 'include/raul', 'raul/*.h') + install_files('INCLUDEDIR', 'raul', 'raul/*.hpp') + install_files('INCLUDEDIR', 'raul', 'raul/*.h') # Pkgconfig file autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, 'GLIBMM GTHREAD') @@ -57,6 +55,7 @@ def build(bld): obj.name = 'libraul' obj.target = 'raul' obj.uselib = 'GLIBMM GTHREAD' + obj.inst_dir = bld.env()['LIBDIRNAME'] obj.vnum = RAUL_LIB_VERSION # Unit tests @@ -64,7 +63,7 @@ def build(bld): # Documentation autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, srcdir, blddir) - install_files('PREFIX', 'share/doc/raul', blddir + '/default/doc/html/*') + install_files('HTMLDIR', '', blddir + '/default/doc/html/*') def shutdown(): autowaf.shutdown() -- cgit v1.2.1