Merge pull request jordansissel#213 from UnifiedPost/develop

Fixed the path_prefix to prefix to allow overriding the gem path
doubleotoo · Apr 26, 2012 · c52e1ac · c52e1ac
2 parents ef0d0c8 + 41ebd34
commit c52e1ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/fpm/package/gem.rb b/lib/fpm/package/gem.rb
@@ -159,8 +159,8 @@ def load_package_info(gem_path)
   end # def load_package_info
 
   def install_to_staging(gem_path)
-    if attributes.include?(:path_prefix)
-      installdir = "#{staging_path}/#{attributes[:path_prefix]}"
+    if attributes.include?(:prefix) && ! attributes[:prefix].nil?
+      installdir = "#{staging_path}/#{attributes[:prefix]}"
     else
       installdir = File.join(staging_path, ::Gem::dir)
     end