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

* lib/mkmf.rb (MakeMakefile#configuration): DESTDIR should never affect

top_srcdir and builddir.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-04-20 07:52:10 +00:00
parent 20e7e86030
commit b528172eba
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Mon Apr 20 16:49:52 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#configuration): DESTDIR should never affect
top_srcdir and builddir.
Mon Apr 20 16:18:17 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk ($(arch)-fake.rb): fix the path separator up for Windows.

View file

@ -1915,7 +1915,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
next if /^abs_/ =~ key
next if /^(?:src|top|hdr)dir$/ =~ key
next unless /dir$/ =~ key
mk << "#{key} = #{with_destdir(var)}\n"
mk << "#{key} = #{/^(?:top_src|build)dir$/ =~ key ? var : with_destdir(var)}\n"
end
if !$extmk and !$configure_args.has_key?('--ruby') and
sep = config_string('BUILD_FILE_SEPARATOR')