From f1a646240bc25a4a6632d99173354e8dfb99a342 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 1 Jun 2011 15:11:05 -0500 Subject: [PATCH] configure: Fix 'make -s' on Windows Use REM instead of '#' to disable @echo commands. Thanks to Ben Franksen for the hint. --- configure/CONFIG_COMMON | 3 ++- configure/os/CONFIG.win32-x86-borland.Common | 1 + configure/os/CONFIG.win32-x86-mingw.Common | 1 + configure/os/CONFIG.win32-x86.Common | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 7ea90a944..338bd258a 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -82,7 +82,8 @@ COMMON_DIR = ../O.Common #------------------------------------------------------- # Make echo output - suppress echoing if make's '-s' flag is set -ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo) +COMMENT = \# +ECHO = $(if $(findstring s,$(MAKEFLAGS)),$(COMMENT),@echo) #------------------------------------------------------- ifdef T_A diff --git a/configure/os/CONFIG.win32-x86-borland.Common b/configure/os/CONFIG.win32-x86-borland.Common index 0d20d35e7..0ad43a3b1 100644 --- a/configure/os/CONFIG.win32-x86-borland.Common +++ b/configure/os/CONFIG.win32-x86-borland.Common @@ -12,6 +12,7 @@ MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = REM WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO diff --git a/configure/os/CONFIG.win32-x86-mingw.Common b/configure/os/CONFIG.win32-x86-mingw.Common index 2e72d8668..dedfc1b8e 100644 --- a/configure/os/CONFIG.win32-x86-mingw.Common +++ b/configure/os/CONFIG.win32-x86-mingw.Common @@ -15,6 +15,7 @@ MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = REM WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common index 8d6565815..ce6f439b1 100644 --- a/configure/os/CONFIG.win32-x86.Common +++ b/configure/os/CONFIG.win32-x86.Common @@ -12,6 +12,7 @@ MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = REM WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO