From 200c840b952a65fca10d5f3a47b69288f1d3dc65 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 7 Jun 2019 09:02:48 +0900
Subject: Revert "Moved Makefile.in under template"

This reverts commits:
* 6f9d5fafe040cb02a1278fbfcdcb8063d564824c
* bb3c89b6437049e26669b2156310670d5e06e386

And remove the dependency of Makefile on Makefile.in
transitionally.
---
 tool/make-snapshot | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tool')

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,
-- 
cgit v1.2.3