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: [PATCH] Revert "Moved Makefile.in under template"

This reverts commits:
* 6f9d5fafe040cb02a1278fbfcdcb8063d564824c
* bb3c89b6437049e26669b2156310670d5e06e386

And remove the dependency of Makefile on Makefile.in
transitionally.
---
 .travis.yml                         | 2 +-
 template/Makefile.in => Makefile.in | 2 +-
 configure.ac                        | 2 +-
 defs/gmake.mk                       | 2 +-
 tool/make-snapshot                  | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename template/Makefile.in => Makefile.in (99%)

diff --git a/.travis.yml b/.travis.yml
index 17eec60bf8..4143defed0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -370,7 +370,7 @@ before_script:
   - ln -s ~/.downloaded-cache
   - "> config.status"
   - "> .rbconfig.time"
-  - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
+  - sed -f tool/prereq.status Makefile.in common.mk > Makefile
   - make touch-unicode-files
   - make -s $JOBS $UPDATE_UNICODE up
   - make -s $JOBS srcs
diff --git a/template/Makefile.in b/Makefile.in
similarity index 99%
rename from template/Makefile.in
rename to Makefile.in
index 0fdc31ab3d..1cac12aeab 100644
--- a/template/Makefile.in
+++ b/Makefile.in
@@ -334,7 +334,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
 	$(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
 	$(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
 
-Makefile:	$(srcdir)/template/Makefile.in $(srcdir)/enc/Makefile.in
+Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
 $(MKFILES): config.status $(srcdir)/version.h
 		@[ -f $@ ] && mv $@ $@.old
diff --git a/configure.ac b/configure.ac
index bed27c98f0..7f0a14b213 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3915,7 +3915,7 @@ AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s
 AS_IF([test x"$firstmf" != x], [
     AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
 ])
-AC_CONFIG_FILES(Makefile:template/Makefile.in, [
+AC_CONFIG_FILES(Makefile, [
     tmpmk=confmk$$.tmp
     {
 	AS_IF([test ${VCS+set}], [
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 738c8e33c0..2fece7a6b1 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS
 	+$(Q) \
 	{ \
 	  $(CHDIR) "$(srcdir)"; \
-	  sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk template/Makefile.in; \
+	  sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \
 	  sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
 	} | \
 	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
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,