Permalink
Browse files

Fix some issues related to alternate install directories

  • Loading branch information...
ferrous26 committed Sep 24, 2012
1 parent 032cb54 commit 16a5022bceaf60b10d2d059b5346b53425731c1a
Showing with 3 additions and 3 deletions.
  1. +3 −3 rakelib/install.rake
View
@@ -175,7 +175,7 @@ namespace :install do
makedirs FRAMEWORK_USR_BIN
- for src in Dir['bin/*']
+ for src in Dir.glob('bin/*')
next unless File.file?(src)
next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
@@ -223,7 +223,7 @@ namespace :install do
ext_name, sub_path = path.scan(/^ext\/(.+)\/lib\/(.+)$/)[0]
next unless EXTENSIONS.include?(ext_name)
sub_dir = File.dirname(sub_path)
- install path, "#{RUBY_SITE_LIB2}/#{sub_dir}", :mode => prog_mode
+ install_recursive path, "#{RUBY_SITE_LIB2}/#{sub_dir}", :mode => prog_mode
end
puts 'Installing extension objects'
@@ -292,7 +292,7 @@ namespace :install do
next if file.match(/^\./)
# Except rb_nibtool & llc!
next if file == 'rb_nibtool' or file == 'llc'
- link = "../../../#{FRAMEWORK_USR_BIN}/#{file}"
+ link = with_destdir "#{FRAMEWORK_USR_BIN}/#{file}"
link.sub!(/#{INSTALL_VERSION}/, 'Current')
link_dest = "#{dest_bin}/#{File.basename(file)}"
unless File.exists?(with_destdir(link_dest))

0 comments on commit 16a5022

Please sign in to comment.