Support to build on pwd != mruby source root

1 files changed, 9 insertions, 6 deletions

diff --git a/mrblib/mrblib.rake b/mrblib/mrblib.rake
index 5b4070745..3cd66d0d5 100644
--- a/mrblib/mrblib.rake
+++ b/mrblib/mrblib.rake
@@ -1,14 +1,17 @@
 MRuby.each_target do
-  dir = File.dirname(__FILE__).relative_path_from(root)
-  self.libmruby << objfile("#{build_dir}/#{dir}/mrblib")
+  current_dir = File.dirname(__FILE__).relative_path_from(Dir.pwd)
+  relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
+  current_build_dir = "#{build_dir}/#{relative_from_root}"
+  
+  self.libmruby << objfile("#{current_build_dir}/mrblib")
 
-  file objfile("#{build_dir}/#{dir}/mrblib") => "#{build_dir}/#{dir}/mrblib.c"
-  file "#{build_dir}/#{dir}/mrblib.c" => [mrbcfile] + Dir.glob("#{dir}/*.rb") do |t|
+  file objfile("#{current_build_dir}/mrblib") => "#{current_build_dir}/mrblib.c"
+  file "#{current_build_dir}/mrblib.c" => [mrbcfile] + Dir.glob("#{current_dir}/*.rb") do |t|
     mrbc_, *rbfiles = t.prerequisites
     FileUtils.mkdir_p File.dirname(t.name)
     open(t.name, 'w') do |f|
-      _pp "GEN", "*.rb", "#{t.name}"
-      f.puts File.read("#{dir}/init_mrblib.c")
+      _pp "GEN", "*.rb", "#{t.name.relative_path}"
+      f.puts File.read("#{current_dir}/init_mrblib.c")
       mrbc.run f, rbfiles, 'mrblib_irep'
     end
   end