yugui	2009-01-30 14:41:31 +0900 (Fri, 30 Jan 2009)

  New Revision: 21895

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

  Log:
    merges r21893 from trunk into ruby_1_9_1.
    * tool/make-snapshot (prereq): remove enc.mk from tarball because
      BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/tool/make-snapshot

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21894)
+++ ruby_1_9_1/ChangeLog	(revision 21895)
@@ -1,3 +1,8 @@
+Fri Jan 30 14:31:14 2009  NAKAMURA Usaku  <usa@r...>
+
+	* tool/make-snapshot (prereq): remove enc.mk from tarball because
+	  BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk.
+
 Fri Jan 30 14:11:48 2009  NAKAMURA Usaku  <usa@r...>
 
 	* enc/depend: extract comile rules to each target for VC++.
Index: ruby_1_9_1/tool/make-snapshot
===================================================================
--- ruby_1_9_1/tool/make-snapshot	(revision 21894)
+++ ruby_1_9_1/tool/make-snapshot	(revision 21895)
@@ -163,15 +163,7 @@
         f.puts(IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]})
         f.puts(commonmk.gsub(/\{[^{}]*\}/, ""))
       end
-      File.open("enc.mk", "r+b") do |f|
-        data = f.read
-        data.gsub!(/^((?:ENC|TRANS)(?:OBJ|SO)(?:S|DIR)\s*=)(?:.*\\\n)*.*/, '\1')
-        data.sub!(/^(clean:.*)(?:\n\t.*)+/, '\1')
-        f.rewind
-        f.truncate(0)
-        f.print data
-      end
-      clean.push("rbconfig.rb", ".rbconfig.time")
+      clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
       print "prerequisites"
     else
       system("#{YACC} -o parse.c parse.y")

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