1 files changed, 9 insertions, 9 deletions

diff --git a/main/build/MacOSX/monostub.m b/main/build/MacOSX/monostub.m
index 059cb34c79..e4ac9256a1 100644
--- a/main/build/MacOSX/monostub.m
+++ b/main/build/MacOSX/monostub.m
@@ -263,7 +263,7 @@ launcher_variable (const char *app_name)
 }
 
 static void
-update_environment (const char *macosDir, const char *app)
+update_environment (const char* macosDir, const char *resourcesDir, const char *app)
 {
 	char *value, *v1, *v2;
 	char *variable;
@@ -279,8 +279,8 @@ update_environment (const char *macosDir, const char *app)
 	push_env ("PKG_CONFIG_PATH", "/Library/Frameworks/Mono.framework/External/pkgconfig");
 	
 	/* Enable the use of stuff bundled into the app bundle */
-	if ((v2 = str_append (macosDir, "/share/pkgconfig"))) {
-		if ((v1 = str_append (macosDir, "/lib/pkgconfig:"))) {
+	if ((v2 = str_append (resourcesDir, "/lib/pkgconfig"))) {
+		if ((v1 = str_append (resourcesDir, "/lib/pkgconfig:"))) {
 			if ((value = str_append (v1, v2))) {
 				push_env ("PKG_CONFIG_PATH", value);
 				free (value);
@@ -292,15 +292,15 @@ update_environment (const char *macosDir, const char *app)
 		free (v2);
 	}
 	
-	if ((value = str_append (macosDir, "/lib"))) {
+	if ((value = str_append (resourcesDir, "/lib"))) {
 		push_env ("DYLD_FALLBACK_LIBRARY_PATH", value);
 		free (value);
 	}
 	
-	push_env ("MONO_GAC_PREFIX", macosDir);
+	push_env ("MONO_GAC_PREFIX", resourcesDir);
 	
-	if ((value = str_append (macosDir, "/bin"))) {
-		push_env ("PATH", macosDir);
+	if ((value = str_append (resourcesDir, "/../MacOS"))) {
+		push_env ("PATH", resourcesDir);
 		free (value);
 	}
 	
@@ -360,7 +360,7 @@ env2bool (const char *env, bool defaultValue)
 int main (int argc, char **argv)
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSString *binDir = [[NSString alloc] initWithUTF8String: "Contents/MacOS/lib/monodevelop/bin"];
+	NSString *binDir = [[NSString alloc] initWithUTF8String: "Contents/Resources/lib/monodevelop/bin"];
 	NSString *appDir = [[NSBundle mainBundle] bundlePath];
 	// can be overridden with plist string MonoMinVersion
 	NSString *req_mono_version = @"3.0.7";
@@ -390,7 +390,7 @@ int main (int argc, char **argv)
 		basename++;
 	
 	if (is_launcher (basename)) {
-		update_environment ([[appDir stringByAppendingPathComponent:@"Contents/MacOS"] UTF8String], basename);
+		update_environment ([[appDir stringByAppendingPathComponent:@"Contents/MacOS"] UTF8String], [[appDir stringByAppendingPathComponent:@"Contents/Resources"] UTF8String], basename);
 		[pool drain];
 		
 		return execv (argv[0], argv);