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

ruby-changes:10294

From: yugui <ko1@a...>
Date: Wed, 28 Jan 2009 18:24:25 +0900 (JST)
Subject: [ruby-changes:10294] Ruby:r21838 (ruby_1_9_1): merges r21783 from trunk into ruby_1_9_1.

yugui	2009-01-28 18:23:46 +0900 (Wed, 28 Jan 2009)

  New Revision: 21838

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

  Log:
    merges r21783 from trunk into ruby_1_9_1.
    * lib/mkmf.rb (create_makefile): should point correct path to
      ruby.h and defines.h.   [ruby-core:21570]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/mkmf.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21837)
+++ ruby_1_9_1/ChangeLog	(revision 21838)
@@ -1,3 +1,8 @@
+Tue Jan 27 03:23:43 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/mkmf.rb (create_makefile): should point correct path to
+	  ruby.h and defines.h.   [ruby-core:21570]
+
 Mon Jan 26 16:00:40 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_aset): fixed arguments evaluation order.
Index: ruby_1_9_1/lib/mkmf.rb
===================================================================
--- ruby_1_9_1/lib/mkmf.rb	(revision 21837)
+++ ruby_1_9_1/lib/mkmf.rb	(revision 21838)
@@ -1784,7 +1784,7 @@
   if File.exist?(depend)
     mfile.print("###\n", *depend_rules(File.read(depend)))
   else
-    headers = %w[ruby.h defines.h]
+    headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
     if RULE_SUBST
       headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
     end

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

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