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

ruby-changes:35205

From: kazu <ko1@a...>
Date: Tue, 26 Aug 2014 13:51:28 +0900 (JST)
Subject: [ruby-changes:35205] kazu:r47287 (trunk): * template/fake.rb.in: fix failed to make install when srcdir != builddir.

kazu	2014-08-26 13:51:19 +0900 (Tue, 26 Aug 2014)

  New Revision: 47287

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

  Log:
    * template/fake.rb.in: fix failed to make install when srcdir != builddir.

  Modified files:
    trunk/ChangeLog
    trunk/template/fake.rb.in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47286)
+++ ChangeLog	(revision 47287)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Aug 26 13:46:33 2014  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* template/fake.rb.in: fix failed to make install when srcdir !=
+	  builddir.
+
 Tue Aug 26 13:43:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* test/ruby/test_range.rb: added workaround for VERBOSE message.
Index: template/fake.rb.in
===================================================================
--- template/fake.rb.in	(revision 47286)
+++ template/fake.rb.in	(revision 47287)
@@ -18,7 +18,7 @@ class Object https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L18
   RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 end
 builddir = File.dirname(__FILE__)
-top_srcdir = File.join(builddir, "@srcdir@")
+top_srcdir = File.expand_path("@srcdir@", builddir)
 $:.unshift(File.expand_path(builddir))
 fake = File.join(top_srcdir, "tool/fake.rb")
 eval(File.read(fake), nil, fake)

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

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