From: Guenter Knauf <lists@gknw.net>
Date: Tue, 10 Aug 2010 13:25:48 +0000 (+0200)
Subject: Changed test for -u switch in order to enable other wmake switches.
X-Git-Tag: curl-7_21_1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44e5e37f3895f67a94fedb6040ba800a9992762e;p=thirdparty%2Fcurl.git

Changed test for -u switch in order to enable other wmake switches.

The var %MAKEFLAGS is only set in 3 cases: if set as environment
var or as macro definition from commandline, and either with the
-u or -ms switch. Since all these cases are unlikely for the average
user it should be safe to only test if %MAKEFLAGS is defined; this
has the benefit that now all other switches can be used again in
addition to the -u which was formerly not possible.
---

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 4807972f1b..07f2a2d9a7 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -80,7 +80,7 @@ LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg
 LIB_ARG  = $(OBJ_BASE)\stat\wlib.arg
 
 # In order to process Makefile.inc wmake must be called with -u switch!
-!ifneq __MAKEOPTS__ -u
+!ifndef %MAKEFLAGS
 !error You MUST call wmake with the -u switch!
 !else
 !include Makefile.inc
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 9b3479238b..9fa3ab4a0c 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -67,7 +67,7 @@ OBJ_DIR  = WC_Win32.obj
 LINK_ARG = $(OBJ_DIR)\wlink.arg
 
 # In order to process Makefile.inc wmake must be called with -u switch!
-!ifneq __MAKEOPTS__ -u
+!ifndef %MAKEFLAGS
 !error You MUST call wmake with the -u switch!
 !else
 !include Makefile.inc