From e1c6990a81b3bc24308ff905e4196f03625a10b3 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 30 Sep 2008 18:53:55 +0000
Subject: Install modules (mostly) the same place as autohell.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1555 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/wscript        |  2 +-
 src/engine/wscript        |  2 +-
 src/gui/wscript           | 12 +++++-------
 src/module/wscript        |  5 ++---
 src/serialisation/wscript |  2 +-
 src/shared/wscript        |  2 +-
 wscript                   |  3 +++
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/client/wscript b/src/client/wscript
index c4b355c3..f057f8ed 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -31,5 +31,5 @@ def build(bld):
 	obj.name     = 'libingen_client'
 	obj.target   = 'ingen_client'
 	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP'
-	obj.vnum     = '0.0.0'
+	obj.inst_dir = 'lib/ingen'
 
diff --git a/src/engine/wscript b/src/engine/wscript
index 5a115108..1501b306 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -76,5 +76,5 @@ def build(bld):
 	obj.name     = 'libingen_engine'
 	obj.target   = 'ingen_engine'
 	obj.uselib   = 'GLIBMM GTHREAD SLV2 JACK LIBLO RAUL REDLANDMM SOUP'
-	obj.vnum     = '0.0.0'
+	obj.inst_dir = 'lib/ingen'
 
diff --git a/src/gui/wscript b/src/gui/wscript
index 31ecdea7..751d5e08 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -41,14 +41,12 @@ def build(bld):
 	if bld.env()['HAVE_CURL']:
 		obj.source += 'UploadPatchWindow.cpp'
 
-	dir = Params.g_options.datadir or bld.env()['PREFIX'] + 'share/ingen'
-
 	obj.includes       = ['..', '../common']
-	obj.defines        = 'INGEN_DATA_DIR=\\\"' + dir + '\\\"'
+	obj.defines        = 'INGEN_DATA_DIR=\\\"' + Params.g_options.datadir + '\\\"'
 	obj.name           = 'libingen_gui'
 	obj.target         = 'ingen_gui'
-	obj.vnum           = '0.0.0'
-	obj.uselib_local   = 'libingen_client libingen_shared'
+	obj.inst_dir       = 'lib/ingen'
+	obj.uselib_local   = 'libingen_shared'
 	obj.uselib         = '''
 		CURL
 		FLOWCANVAS
@@ -65,7 +63,7 @@ def build(bld):
 	'''
 	
 	# GUI runtime files
-	install_files(dir, '', 'ingen_gui.glade')
-	install_files(dir, '', 'ingen.svg')
+	install_files(Params.g_options.datadir, '', 'ingen_gui.glade')
+	install_files(Params.g_options.datadir, '', 'ingen.svg')
 
 
diff --git a/src/module/wscript b/src/module/wscript
index bdcbebc9..044f57ed 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -2,16 +2,15 @@
 import Params
 
 def build(bld):
-	dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib'
 	obj = bld.create_obj('cpp', 'shlib')
 	obj.source = '''
 		Module.cpp
 		global.cpp
 	'''
 	obj.includes = ['..', '../common']
-	obj.defines  = 'INGEN_MODULE_DIR=\\\"' + dir + '\\\"'
+	obj.defines  = 'INGEN_MODULE_DIR=\\\"' + bld.env()['PREFIX'] + 'lib/ingen/\\\"'
 	obj.name     = 'libingen_module'
 	obj.target   = 'ingen_module'
-	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM'
 	obj.vnum     = '0.0.0'
+	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM'
 
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 4e67f3f9..10ec8186 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -12,5 +12,5 @@ def build(bld):
 	obj.name     = 'libingen_serialisation'
 	obj.target   = 'ingen_serialisation'
 	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM'
-	obj.vnum     = '0.0.0'
+	obj.inst_dir = 'lib/ingen'
 
diff --git a/src/shared/wscript b/src/shared/wscript
index 3c7814a9..34ea8f3e 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -14,6 +14,6 @@ def build(bld):
 	obj.includes = ['../', '../common']
 	obj.name     = 'libingen_shared'
 	obj.target   = 'ingen_shared'
-	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM'
 	obj.vnum     = '0.0.0'
+	obj.uselib   = 'GLIBMM SLV2 RAUL REDLANDMM'
 
diff --git a/wscript b/wscript
index 3da79be8..f31ac53b 100644
--- a/wscript
+++ b/wscript
@@ -48,6 +48,9 @@ def configure(conf):
 	conf.env.append_value('CXXFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
 
 def build(bld):
+	opts = Params.g_options
+	opts.datadir   = opts.datadir   or bld.env()['PREFIX'] + 'share'
+	opts.moduledir = opts.moduledir or bld.env()['PREFIX'] + 'lib/ingen'
 	bld.add_subdirs('src/engine')
 	bld.add_subdirs('src/serialisation')
 	bld.add_subdirs('src/module')
-- 
cgit v1.2.1