From 7f363152c55e839596c262b491b747e4d24b0b62 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 9 Apr 2000 06:15:43 +0000
Subject: [PATCH] * Makefile.in: Work around MAKEOVERRIDES problem with older
 versions of make. * Makefile.common: Ditto.

---
 winsup/ChangeLog       |  6 ++++++
 winsup/Makefile.common |  8 +++++++-
 winsup/Makefile.in     | 14 ++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index d7ece8a75..ce5cad35c 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,9 @@
+Sun Apr  9 02:06:49 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Work around MAKEOVERRIDES problem with older versions
+	of make.
+	* Makefile.common: Ditto.
+
 Fri Apr  7 17:04:02  Ron Parker <rdparker@sourceware.cygnus.com>
 
 	* configure.in: Added cinstall to the list of subdirs.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index c6143426a..661a4d77e 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -88,7 +88,13 @@ COMPILE_CC:=$(CC) $c -nostdinc $(ALL_CFLAGS) -I$(GCC_INCLUDE)
 
 vpath %.a	$(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm
 
-unexport MAKEOVERRIDES
+MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c}
+
+ifneq ($(MAKEOVERRIDES_WORKAROUND),)
+    override MAKE:=$(MAKE) $(MAKEOVERRIDES)
+    MAKEOVERRIDES:=
+    export MAKEOVERRIDES
+endif
 
 .PRECIOUS: %.o
 
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index dcb1263c0..f29734de9 100644
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -45,7 +45,13 @@ CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)}
 
 .SUFFIXES:
 
-unexport MAKEOVERRIDES
+MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c}
+
+ifneq ($(MAKEOVERRIDES_WORKAROUND),)
+    override MAKE:=$(MAKE) $(MAKEOVERRIDES)
+    MAKEOVERRIDES:=
+    export MAKEOVERRIDES
+endif
 
 all: Makefile $(SUBDIRS)
 
@@ -54,13 +60,13 @@ install: Makefile $(INSTALL_SUBDIRS)
 clean: $(CLEAN_SUBDIRS)
 
 $(SUBDIRS):
-	@$(MAKE) -C $@ $(MAKEOVERRIDES) all
+	@$(MAKE) -C $@ all
 
 $(INSTALL_SUBDIRS):
-	@$(MAKE) -C ${patsubst install_%,%,$@} $(MAKEOVERRIDES) install
+	@$(MAKE) -C ${patsubst install_%,%,$@} install
 
 $(CLEAN_SUBDIRS):
-	@$(MAKE) -C ${patsubst clean_%,%,$@} $(MAKEOVERRIDES) clean
+	@$(MAKE) -C ${patsubst clean_%,%,$@} clean
 
 .PRECIOUS: Makefile