[前][次][番号順一覧][スレッド一覧]

ruby-changes:38274

From: usa <ko1@a...>
Date: Mon, 20 Apr 2015 16:52:20 +0900 (JST)
Subject: [ruby-changes:38274] usa:r50355 (trunk): * lib/mkmf.rb (MakeMakefile#configuration): DESTDIR should never affect

usa	2015-04-20 16:52:10 +0900 (Mon, 20 Apr 2015)

  New Revision: 50355

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50355

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50354)
+++ ChangeLog	(revision 50355)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Apr 20 16:49:52 2015  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb (MakeMakefile#configuration): DESTDIR should never affect
+	  top_srcdir and builddir.
+
 Mon Apr 20 16:18:17 2015  NAKAMURA Usaku  <usa@r...>
 
 	* common.mk ($(arch)-fake.rb): fix the path separator up for Windows.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 50354)
+++ lib/mkmf.rb	(revision 50355)
@@ -1915,7 +1915,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARA https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1915
       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')

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]