diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-08-10 15:25:48 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-08-10 15:32:56 +0200 |
| commit | 44e5e37f3895f67a94fedb6040ba800a9992762e (patch) | |
| tree | a9f76f2fb7f607f07aa203570b5e9cffa50326ef | |
| parent | 1d594772fd15143ad602ac90f5bb2f58f8b06f1a (diff) | |
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.
| -rw-r--r-- | lib/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 4807972f1..07f2a2d9a 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 9b3479238..9fa3ab4a0 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 |