aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2010-08-10 21:27:01 +0200
committerGuenter Knauf <lists@gknw.net>2010-08-10 21:27:01 +0200
commit06869597c3f5b29e69786c6f51321e6783c45461 (patch)
treeeb1676c16a8f77cd21829b57f12512c53b7c15ea
parent517f3a1b8fccb65c4db4c083077169e9624cb4c0 (diff)
More Watcom makefile fixes ...
Final fix (hopefully!) for dll wlink loader; prefer faster internal rm if available.
-rw-r--r--lib/Makefile.Watcom12
-rw-r--r--src/Makefile.Watcom12
2 files changed, 16 insertions, 8 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index bae1bd459..63624d31a 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 1c628a4e1..84d78c1f2 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