6 files changed, 72 insertions, 7 deletions
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 9cf69596..f49d394c 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -107,7 +107,7 @@ App::run(int argc, char** argv, Ingen::Shared::World* world)
 	_instance->configuration()->apply_settings();
 	
 	// Set default window icon
-	const Glib::ustring icon_path = PKGDATADIR "/ingen.svg";
+	const Glib::ustring icon_path = INGEN_DATA_DIR "/ingen.svg";
 	try {
 		if (Glib::file_test(icon_path, Glib::FILE_TEST_EXISTS))
 			Gtk::Window::set_default_icon_from_file(icon_path);
diff --git a/src/libs/gui/GladeFactory.cpp b/src/libs/gui/GladeFactory.cpp
index 63dc4d0b..2b4d3ec9 100644
--- a/src/libs/gui/GladeFactory.cpp
+++ b/src/libs/gui/GladeFactory.cpp
@@ -38,14 +38,14 @@ GladeFactory::find_glade_file()
 		glade_filename = "./ingen_gui.glade";
 
 	ifstream fs(glade_filename.c_str());
-	if (fs.fail()) { // didn't find it, check PKGDATADIR
+	if (fs.fail()) { // didn't find it, check INGEN_DATA_DIR
 		fs.clear();
-		glade_filename = PKGDATADIR;
+		glade_filename = INGEN_DATA_DIR;
 		glade_filename += "/ingen_gui.glade";
 	
 		fs.open(glade_filename.c_str());
 		if (fs.fail()) {
-			cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << PKGDATADIR << "." << endl;
+			cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << INGEN_DATA_DIR << "." << endl;
 			throw;
 		}
 		fs.close();
diff --git a/src/libs/gui/LoadPatchWindow.cpp b/src/libs/gui/LoadPatchWindow.cpp
index c33ad495..70d3ec5b 100644
--- a/src/libs/gui/LoadPatchWindow.cpp
+++ b/src/libs/gui/LoadPatchWindow.cpp
@@ -60,7 +60,7 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gno
 	set_filter(filt);
 
 	// Add global examples directory to "shortcut folders" (bookmarks)
-	string examples_dir = PKGDATADIR;
+	string examples_dir = INGEN_DATA_DIR;
 	examples_dir.append("/patches");
 	DIR* d = opendir(examples_dir.c_str());
 	if (d != NULL)
diff --git a/src/libs/gui/LoadSubpatchWindow.cpp b/src/libs/gui/LoadSubpatchWindow.cpp
index 52a989af..71dbfb36 100644
--- a/src/libs/gui/LoadSubpatchWindow.cpp
+++ b/src/libs/gui/LoadSubpatchWindow.cpp
@@ -65,7 +65,7 @@ LoadSubpatchWindow::LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefP
 	property_select_multiple() = true;
 	
 	// Add global examples directory to "shortcut folders" (bookmarks)
-	string examples_dir = PKGDATADIR;
+	string examples_dir = INGEN_DATA_DIR;
 	examples_dir.append("/patches");
 	DIR* d = opendir(examples_dir.c_str());
 	if (d != NULL)
diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am
index 6acd9b9f..41458812 100644
--- a/src/libs/gui/Makefile.am
+++ b/src/libs/gui/Makefile.am
@@ -15,7 +15,7 @@ module_LTLIBRARIES = libingen_gui.la
 
 libingen_gui_la_CXXFLAGS = \
 	-DINGEN_MODULE_DIR=\"$(libdir)/ingen\" \
-	-DPKGDATADIR=\"$(pkgdatadir)\" \
+	-DINGEN_DATA_DIR=\"$(pkgdatadir)\" \
 	@CURL_CFLAGS@ \
 	@FLOWCANVAS_CFLAGS@ \
 	@GNOMECANVASMM_CFLAGS@ \
diff --git a/src/libs/gui/wscript b/src/libs/gui/wscript
new file mode 100644
index 00000000..8895c7bc
--- /dev/null
+++ b/src/libs/gui/wscript
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+import Params
+
+def build(bld):
+	obj = bld.create_obj('cpp', 'shlib')
+	obj.source = '''
+		App.cpp
+		BreadCrumbBox.cpp
+		Configuration.cpp
+		ConnectWindow.cpp
+		ControlPanel.cpp
+		Controls.cpp
+		GladeFactory.cpp
+		LoadPatchWindow.cpp
+		LoadPluginWindow.cpp
+		LoadRemotePatchWindow.cpp
+		LoadSubpatchWindow.cpp
+		MessagesWindow.cpp
+		NewSubpatchWindow.cpp
+		NodeControlWindow.cpp
+		NodeMenu.cpp
+		NodeModule.cpp
+		NodePropertiesWindow.cpp
+		ObjectMenu.cpp
+		PatchCanvas.cpp
+		PatchPortModule.cpp
+		PatchPropertiesWindow.cpp
+		PatchTreeWindow.cpp
+		PatchView.cpp
+		PatchWindow.cpp
+		Port.cpp
+		PortMenu.cpp
+		PortPropertiesWindow.cpp
+		RenameWindow.cpp
+		SubpatchModule.cpp
+		ThreadedLoader.cpp
+		WindowFactory.cpp
+		gui.cpp
+	'''
+
+	if bld.env()['HAVE_CURL']:
+		obj.source += 'UploadPatchWindow.cpp'
+
+	dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib/ingen'
+
+	obj.includes       = ['..', '../../common', '../..']
+	obj.defines        = 'INGEN_DATA_DIR=\\\"' + dir + '\\\"'
+	obj.name           = 'libingen_gui'
+	obj.target         = 'ingen_gui'
+	obj.vnum           = '0.0.0'
+	obj.uselib_local   = 'libingen_client libingen_shared'
+	obj.uselib         = '''
+		CURL
+		FLOWCANVAS
+		GLADEMM
+		GLIBMM
+		GNOMECANVASMM
+		GTKMM
+		RAUL
+		REDLANDMM
+		SIGCPP
+		SLV2
+		SOUP
+		XML2
+	'''