Tweak gen/Rakefile to be callable as both a gem Rakefile extension and normally. Based on changes from Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>

3 files changed, 6 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index b859e9a..9352992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ build
 *.so
 *.[oa]
 core
+lib/ffi/types.conf
diff --git a/Rakefile b/Rakefile
index a97a606..5469787 100644
--- a/Rakefile
+++ b/Rakefile
@@ -147,6 +147,7 @@ task :distclean => :clobber do
   FileUtils.rm_rf(Dir["lib/**/ffi_c.#{Config::CONFIG['DLEXT']}"])
   FileUtils.rm_rf('lib/1.8')
   FileUtils.rm_rf('lib/1.9')
+  FileUtils.rm_rf('lib/ffi/types.conf')
   FileUtils.rm_rf('conftest.dSYM')
   FileUtils.rm_rf('pkg')
 end
diff --git a/gen/Rakefile b/gen/Rakefile
index f97f845..2b16621 100644
--- a/gen/Rakefile
+++ b/gen/Rakefile
@@ -1,6 +1,7 @@
 require 'fileutils'
-require "#{File.join(ENV['RUBYLIBDIR'], 'ffi', 'tools', 'types_generator.rb')}"
-types_conf = File.join(ENV['RUBYLIBDIR'], 'ffi', 'types.conf') 
+require "#{File.join(File.dirname(__FILE__), '..', 'lib', 'ffi', 'tools', 'types_generator.rb')}"
+types_conf = File.join(File.dirname(__FILE__), '..', 'lib', 'ffi', 'types.conf')
+
 file types_conf do |task|
   options = {}
   FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 })
@@ -8,5 +9,6 @@ file types_conf do |task|
     f.puts FFI::TypesGenerator.generate(options)
   end
 end
+
 task :default => types_conf do
 end