Made libdir configurable.

diff --git a/Rakefile b/Rakefile
index cc83c7f029672d1338198102b6fc32077e69178a..ba98a96cc899ff43cd4436898068cb5803c020de 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# $Id: Rakefile 318 2005-04-26 11:11:48Z tilman $
+# $Id: Rakefile 319 2005-04-26 21:19:30Z tilman $
 
 require "library"
 require "rake/clean"
@@ -11,7 +11,7 @@ require "rake/contrib/sshpublisher"
 CLOBBER.include("src/*/*.{s,}o")
 
 ext_libs = ["ecore", "ecore_evas", "ecore_job", "ecore_x"].map do |lib|
-       Library.new(lib)
+       Library.new(lib, "src/#{lib}")
 end
 
 task :default => ext_libs.map { |l| l.so }

diff --git a/library.rb b/library.rb
index bf6bd9e1eb6e6da0681fa4be68c47ac42cd15b35..f84c8ebd496bc3832b984eee9734bb54b9d7a86b 100644 (file)
--- a/library.rb
+++ b/library.rb
@@ -1,12 +1,13 @@
-# $Id: library.rb 318 2005-04-26 11:11:48Z tilman $
+# $Id: library.rb 319 2005-04-26 21:19:30Z tilman $
 
 require "rbconfig"
 
 class Library
        PREFIX = ENV["ECORE_PREFIX"] || "/usr/local/"
 
-       def initialize(name)
+       def initialize(name, dir)
                @name = name
+               @dir = dir
        end
 
        def ldflags
@@ -20,10 +21,10 @@ class Library
        end
 
        def so
-               "src/#{@name}/#{@name}.so"
+               "#{@dir}/#{@name}.so"
        end
 
        def objects
-               Dir["src/#{@name}/*.c"].map { |f| f.sub(/\.[^.]+$/, ".o") }
+               Dir["#{@dir}/*.c"].map { |f| f.sub(/\.[^.]+$/, ".o") }
        end
 end