kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (create_makefile, install_files): honor srcprefix

Browse source 
argument if given.  [ruby-dev:40449]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-21 12:20:21 +00:00
parent 33dd3c94bd
commit 3ef72aebef
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Feb 21 21:20:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile, install_files): honor srcprefix
argument if given. [ruby-dev:40449]
Sun Feb 21 13:29:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Feb 21 13:29:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems/rubygems_version.rb: outdated. [ruby-core:28275] * lib/rubygems/rubygems_version.rb: outdated. [ruby-core:28275]

4
lib/mkmf.rb
View file

@ -624,7 +624,7 @@ end
def install_files(mfile, ifiles, map = nil, srcprefix = nil) def install_files(mfile, ifiles, map = nil, srcprefix = nil)
ifiles or return ifiles or return
ifiles.empty? and return ifiles.empty? and return
srcprefix ||= '$(srcdir)' srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
RbConfig::expand(srcdir = srcprefix.dup) RbConfig::expand(srcdir = srcprefix.dup)
dirs = [] dirs = []
path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]} path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
@ -1684,7 +1684,7 @@ def create_makefile(target, srcprefix = nil)
target_prefix = "" target_prefix = ""
end end
srcprefix = "$(srcdir)/#{srcprefix}".chomp('/') srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
RbConfig.expand(srcdir = srcprefix.dup) RbConfig.expand(srcdir = srcprefix.dup)
ext = ".#{$OBJEXT}" ext = ".#{$OBJEXT}"