diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-20 07:52:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-20 07:52:10 +0000 |
| commit | b528172ebaa284f26fca5f3bc8ea3044d0263d21 (patch) | |
| tree | 755788352cfb760f7a7992661b3d5fb7853495e9 | |
| parent | 20e7e86030e0e74e52aa24a50545a6789a3f90f2 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 044d72777a..0f588a56ee 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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') |