nobu	2010-08-07 17:18:42 +0900 (Sat, 07 Aug 2010)

  New Revision: 28899

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

  Log:
    * ext/extmk.rb (extract_makefile): follow the change of
      install-rb-default line format at r28850, which causes second
      run to create dummy makefiles.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28898)
+++ ChangeLog	(revision 28899)
@@ -1,3 +1,9 @@
+Sat Aug  7 17:18:34 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb (extract_makefile): follow the change of
+	  install-rb-default line format at r28850, which causes second
+	  run to create dummy makefiles.
+
 Sat Aug  7 14:08:44 2010  NARUSE, Yui  <naruse@r...>
 
 	* lib/mkmf.rb: change instance variable to global.
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 28898)
+++ ext/extmk.rb	(revision 28899)
@@ -50,7 +50,7 @@
     return keep
   end
   installrb = {}
-  m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
+  m.scan(/^install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
   oldrb = installrb.keys.sort
   newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
   if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]

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