From cb396d4214f7d1c60a9bb45420ef647468b8da2e Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 21 Mar 2021 17:53:20 +0900
Subject: [PATCH] Share variables defined in common GNUmakefile also in
 cygwin/mingw

---
 cygwin/GNUmakefile.in   | 4 +---
 template/GNUmakefile.in | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 86098814a1..095d9d8d1e 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -33,9 +33,7 @@ endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 
--include uncommon.mk
-
-include $(srcdir)/defs/gmake.mk
+include $(srcdir)/template/GNUmakefile.in
 
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
 override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in
index 74fbe84140..e2f2d1aebd 100644
--- a/template/GNUmakefile.in
+++ b/template/GNUmakefile.in
@@ -1,6 +1,11 @@
 gnumake = yes
 
+ifeq ($(filter Makefile,$(MAKEFILE_LIST)),)
 include Makefile
+
+GNUmakefile: $(srcdir)/template/GNUmakefile.in
+endif
+
 override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no)
 
 ifeq ($(HAVE_BASERUBY),yes)
@@ -10,5 +15,3 @@ endif
 include $(srcdir)/defs/universal.mk
 -include uncommon.mk
 include $(srcdir)/defs/gmake.mk
-
-GNUmakefile: $(srcdir)/template/GNUmakefile.in