diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:41:31 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:41:31 +0000 |
commit | bfe8c2d0be86b2c7bcceb167d55aeebfa5faff30 (patch) | |
tree | 58cf5c1ced6e5f5e0340557393b4341bd72ce1cf /tool | |
parent | a5e61c952ea3595552401603793cf323cf0c0aa0 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/make-snapshot | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 13e437b20e..6f564a62ee 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -163,15 +163,7 @@ def package(rev, destdir) 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") |