merging with trunk

git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/testing@86 23306eb0-4c56-4727-a40e-e92c0eb68959

instruby.rb

@@ -409,6 +409,14 @@ def with_destdir(dir)
   end
 end
 
+def ln_sfh(source, target)
+  ln_sf(source, target) unless File.symlink?(with_destdir(target))
+end
+
+def mkdir_p(target, *flags)
+  super(with_destdir(target), *flags)
+end
+
 def install_stuff(what, from, to)
   puts "installing #{what}"
   mkdir_p to, :mode => 0755
@@ -420,10 +428,6 @@ def install_stuff(what, from, to)
   '/Library/Application Support/Developer/3.0/Xcode')
 install_stuff('samples', 'sample-macruby', '/Developer/Examples/Ruby/MacRuby')
 
-def ln_sfh(source, target)
-  ln_sf(source, target) unless File.symlink?(target)
-end
-
 if RUBY_FRAMEWORK
   puts "installing framework"
   base = File.join(CONFIG["prefix"], '..')

objc.m

@@ -2262,7 +2262,8 @@
 
 #undef FIND_LOAD_PATH_IN_LIBRARY
 
-	rb_raise(rb_eRuntimeError, "framework `%s' not found", cstr);
+	rb_raise(rb_eRuntimeError, "framework `%s' not found", 
+	    RSTRING_PTR(framework));
     }
 
 success: