diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-07 09:02:48 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-07 09:03:25 +0900 |
| commit | 200c840b952a65fca10d5f3a47b69288f1d3dc65 (patch) | |
| tree | b408a16e99bb72088b5537549005a013a63b7e91 /tool | |
| parent | bb3c89b6437049e26669b2156310670d5e06e386 (diff) | |
Revert "Moved Makefile.in under template"
This reverts commits:
* 6f9d5fafe040cb02a1278fbfcdcb8063d564824c
* bb3c89b6437049e26669b2156310670d5e06e386
And remove the dependency of Makefile on Makefile.in
transitionally.
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/make-snapshot | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 8b60ee21cb..3e90adba48 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -389,8 +389,7 @@ def package(vcs, rev, destdir, tmp = nil) File.open("#{defaults}/ruby.rb", "w") {} miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross" baseruby = ENV["BASERUBY"] - mk = (IO.read("template/Makefile.in") rescue IO.read("Makefile.in")). - gsub(/^@.*\n/, '') + mk = IO.read("Makefile.in").gsub(/^@.*\n/, '') vars = { "EXTOUT"=>extout, "PATH_SEPARATOR"=>File::PATH_SEPARATOR, |