From: Guenter Knauf <lists@gknw.net>
Date: Tue, 10 Aug 2010 19:27:01 +0000 (+0200)
Subject: More Watcom makefile fixes ...
X-Git-Tag: curl-7_21_1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06869597c3f5b29e69786c6f51321e6783c45461;p=thirdparty%2Fcurl.git

More Watcom makefile fixes ...

Final fix (hopefully!) for dll wlink loader;
prefer faster internal rm if available.
---

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index bae1bd4596..63624d31ad 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -26,15 +26,19 @@ RC = wrc
 !  loaddll wcc386  wccd386
 !  loaddll wpp386  wppd386
 !  loaddll wlib    wlibd
-!  if $(__VERSION__) < 1280
-!    loaddll wlink   wlink
-!  else
+!  if $(__VERSION__) > 1270
 !    loaddll wlink   wlinkd
+!  else
+!    loaddll wlink   wlink
 !  endif
 !endif
 
-MD = mkdir
+!if $(__VERSION__) < 1250                                                                                                           
 RM = del /q /f >NUL 2>&1
+!else                                                                                                                               
+RM = rm -f                                                                                                                          
+!endif
+MD = mkdir
 RD = rmdir /q /s >NUL 2>&1
 CP = copy
 
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 1c628a4e18..84d78c1f27 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -26,15 +26,19 @@ RC = wrc
 !  loaddll wcc386  wccd386
 !  loaddll wpp386  wppd386
 !  loaddll wlib    wlibd
-!  if $(__VERSION__) < 1280
-!    loaddll wlink   wlink
-!  else
+!  if $(__VERSION__) > 1270
 !    loaddll wlink   wlinkd
+!  else
+!    loaddll wlink   wlink
 !  endif
 !endif
 
-MD = mkdir
+!if $(__VERSION__) < 1250
 RM = del /q /f >NUL 2>&1
+!else
+RM = rm -f
+!endif
+MD = mkdir
 RD = rmdir /q /s >NUL 2>&1
 CP = copy