Clone in a terminal:
Commit 13cc498
Johan Mattsson - 2012-11-04T12:37:37+00:00
13cc4985a3dcebe518a501c78cca3954c568c159johan.mattsson.m@gmail.com

fix prefix parameter

Changed files (3)

Diff

diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex c8921c7..c15ae3c 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -344,7 +344,7 @@ os.put_string (  		f = File.new_for_path (@"$PREFIX/birdfont-export"); 		if (f.query_exists ()) {-			return @"$PREFIX/birdfont-export";+			return @"$PREFIX/bin/birdfont-export"; 		}  		warning ("Can't fint birdfont-export.");diff --git a/src/MainWindow.vala b/src/MainWindow.valaindex 27dcc2c..c8690a4 100644--- a/src/MainWindow.vala+++ b/src/MainWindow.vala@@ -39,18 +39,14 @@ public class MainWindow { 		menu_tab = new MenuTab ();
 		tool_tip = new TooltipArea ();
 		over_view = new OverView();
+
+		print (@"\n\nPREFIX: $PREFIX\n\n");
 	}
 
 	public void set_native (NativeWindow nw) {
 		native_window = nw;
 	}
 
-/* // FIXA:
-	public static WebView get_webview () {
-		return singleton.html_canvas;
-	}
-*/
-
 	internal static NativeWindow get_native () {
 		return native_window;
 	}
diff --git a/wscript b/wscriptindex a060617..be05402 100644--- a/wscript+++ b/wscript@@ -36,7 +36,7 @@ def pre (bld): 	bld.env.VERSION = VERSION
 	
 	if not bld.options.noconfig:
-		write_config ()
+		write_config (bld)
 
 def post (bld):
 	bld.exec_command ('${LDCONFIG}')
@@ -59,7 +59,7 @@ def build(bld): 	if bld.options.win32:
 		bld.recurse('win32')
 		
-def write_config ():
+def write_config (cfg):
 	print ("Writing Config.vala")	
 
 	f = open('./src/Config.vala', 'w+')
@@ -79,7 +79,7 @@ def write_config (): 	f.write(";\n")
 
 	f.write("	internal static const string PREFIX = \"")
-	f.write("${PREFIX}")
+	f.write(cfg.options.prefix)
 	f.write("\"");
 	f.write(";\n")
 			

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112