1 files changed, 8 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 51f460583..9dd359244 100644
--- a/Makefile
+++ b/Makefile
@@ -286,8 +286,15 @@ endif
 
 # If the user is running make -s (silent mode), suppress echoing of
 # commands
+# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.
 
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
+short-opts := $(firstword -$(MAKEFLAGS))
+else
+short-opts := $(filter-out --%,$(MAKEFLAGS))
+endif
+
+ifneq ($(findstring s,$(short-opts)),)
   quiet=silent_
 endif