Merge branch 'master' of gitorious.org:supplement/birdfont

Changed files (3)

• modified libbirdfont/ExportTool.vala
• modified scripts/macport_build.py
• modified scripts/macport_configure.py

Diff

diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex c69c122..854bc20 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -397,7 +397,7 @@ os.put_string ( 			}; 		} -		f = File.new_for_path (@"$PREFIX/birdfont-export");+		f = File.new_for_path (@"$PREFIX/bin/birdfont-export"); 		if (f.query_exists ()) { 			return {  				@"$PREFIX/bin/birdfont-export",diff --git a/scripts/macport_build.py b/scripts/macport_build.pyindex 035fa0a..2a57067 100755--- a/scripts/macport_build.py+++ b/scripts/macport_build.py@@ -25,14 +25,14 @@ def build(prefix, cc, cflags, ldflags): 		--define=MAC \ 		--library libbirdfont \ 		-H build/libbirdfont/birdfont.h \-		libbirdfont/* \+		libbirdfont/*.vala \+		libbirdfont/OpenFontFormat/*.vala \ 		--pkg libxml-2.0 \ 		--pkg gio-2.0 \ 		--pkg cairo \ 		--pkg libsoup-2.4 \ 		--pkg gdk-pixbuf-2.0 \ 		--pkg webkit-1.0""")-	run("cp libbirdfont/*.c build/libbirdfont/")  	run(cc + " " + cflags + """ \ 		-c build/libbirdfont/*.c \@@ -157,7 +157,6 @@ def build_app (prefix): 	 	startup = open ('build/BirdFont.app/Contents/MacOS/birdfont.sh', 'w+') 	startup.write ("#!/bin/bash\n")-	startup.write ("cd \"${0%/*}\"\n") 	startup.write (prefix + "/bin/birdfont\n") 	 	run("chmod 755 build/BirdFont.app/Contents/MacOS/birdfont.sh")diff --git a/scripts/macport_configure.py b/scripts/macport_configure.pyindex f6c9579..767957a 100755--- a/scripts/macport_configure.py+++ b/scripts/macport_configure.py@@ -9,6 +9,6 @@ parser.add_option("-p", "--prefix", dest="prefix", help="install prefix", metava (options, args) = parser.parse_args()  if not options.prefix:-	options.prefix = "/usr"+	options.prefix = "/opt/local"  configfile.write_config (options.prefix)