Merge branch 'master' into rails

comboy · Jan 10, 2011 · 395ada2 · 395ada2
2 parents a979efe + 1b3ee7b
commit 395ada2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/gem_template.gemspec b/gem_template.gemspec
@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
+root = File.dirname(__FILE__)
+lib = "#{root}/lib"
 $:.unshift lib unless $:.include?(lib)
 
 require 'gem_template/gems'
@@ -24,8 +25,8 @@ Gem::Specification.new do |s|
     s.add_development_dependency g.to_s, GemTemplate::Gems.versions[g]
   end
 
-  s.executables = `git ls-files -- {bin}/*`.split("\n").collect { |f| File.basename(f) }
-  s.files = `git ls-files`.split("\n")
+  s.executables = `cd #{root} && git ls-files -- {bin}/*`.split("\n").collect { |f| File.basename(f) }
+  s.files = `cd #{root} && git ls-files`.split("\n")
   s.require_paths = %w(lib)
-  s.test_files = `git ls-files -- {features,test,spec}/*`.split("\n")
+  s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
 end