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

ruby-changes:16708

From: nobu <ko1@a...>
Date: Wed, 21 Jul 2010 23:07:35 +0900 (JST)
Subject: [ruby-changes:16708] Ruby:r28704 (trunk): * template/fake.rb.in: get rid of embeding an absolute path.

nobu	2010-07-21 23:07:21 +0900 (Wed, 21 Jul 2010)

  New Revision: 28704

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

  Log:
    * template/fake.rb.in: get rid of embeding an absolute path.

  Modified files:
    trunk/ChangeLog
    trunk/template/fake.rb.in

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28703)
+++ ChangeLog	(revision 28704)
@@ -1,3 +1,7 @@
+Wed Jul 21 23:07:11 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* template/fake.rb.in: get rid of embeding an absolute path.
+
 Wed Jul 21 15:22:17 2010  Evan Phoenix <evan@f...>
 
 	* lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
Index: template/fake.rb.in
===================================================================
--- template/fake.rb.in	(revision 28703)
+++ template/fake.rb.in	(revision 28704)
@@ -30,9 +30,10 @@
   unless extmk
     config = RbConfig::CONFIG
     mkconfig = RbConfig::MAKEFILE_CONFIG
-    mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@")
+    builddir = File.expand_path(File.dirname(__FILE__))
+    mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@top_srcdir@", builddir)
     mkconfig["rubyhdrdir"] = "$(top_srcdir)/include"
-    mkconfig["builddir"] = config["builddir"] = File.expand_path(File.dirname(__FILE__))
+    mkconfig["builddir"] = config["builddir"] = builddir
     config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include")
     mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
     trace_var(:$ruby, posthook)

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

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