зеркало из https://github.com/github/ruby.git
* ext/extmk.rb (extract_makefile): follow the change of
install-rb-default line format at r28850, which causes second run to create dummy makefiles. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
c53664c84d
Коммит
e4e9758aa5
|
@ -1,3 +1,9 @@
|
||||||
|
Sat Aug 7 17:18:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/extmk.rb (extract_makefile): follow the change of
|
||||||
|
install-rb-default line format at r28850, which causes second
|
||||||
|
run to create dummy makefiles.
|
||||||
|
|
||||||
Sat Aug 7 14:08:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
Sat Aug 7 14:08:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* lib/mkmf.rb: change instance variable to global.
|
* lib/mkmf.rb: change instance variable to global.
|
||||||
|
|
|
@ -50,7 +50,7 @@ def extract_makefile(makefile, keep = true)
|
||||||
return keep
|
return keep
|
||||||
end
|
end
|
||||||
installrb = {}
|
installrb = {}
|
||||||
m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
|
m.scan(/^install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
|
||||||
oldrb = installrb.keys.sort
|
oldrb = installrb.keys.sort
|
||||||
newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
|
newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
|
||||||
if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
|
if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче