Index: unitools.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unitools.mk,v
retrieving revision 1.19
diff -c -r1.19 unitools.mk
*** unitools.mk	4 Nov 2002 18:10:43 -0000	1.19
--- unitools.mk	19 Mar 2003 13:14:48 -0000
***************
*** 59,66 ****
  #
  #
  #*************************************************************************
! .IF "$(GUI)"!="UNX"
! .IF "$(GUI)"!="MAC"
  AWK*=awk
  SORT*=sort
  SED*=sed
--- 59,65 ----
  #
  #
  #*************************************************************************
! .IF "$(GUI)"=="WNT"
  AWK*=awk
  SORT*=sort
  SED*=sed
***************
*** 81,87 ****
  RENAME*=mv
  TOUCH*=touch
  TYPE*=cat
! .ELSE
  COPY*=copy
  COPYRECURSE=/s
  COPYUPDATE=/u
--- 80,86 ----
  RENAME*=mv
  TOUCH*=touch
  TYPE*=cat
! .ELSE			# "$(USE_SHELL)"!="4nt"
  COPY*=copy
  COPYRECURSE=/s
  COPYUPDATE=/u
***************
*** 98,140 ****
  RENAME*=ren
  TOUCH*=$(BUILD_TOOLS)$/touch.exe
  TYPE*=type
! .ENDIF
  MKDIRHIER=$(MKDIR) 
- .IF "$(GUI)"=="WNT"
  SCP_CHECK_TOOL=checkscp.exe
  
! #signing for win32 only
! SIGNCODE=$(BUILD_TOOLS)$/PackSign$/signcode
! CABARC=$(BUILD_TOOLS)$/PackSign$/cabarc
! SIGNTOOL=$(BUILD_TOOLS)$/signtool$/signtool
! .ENDIF
! .IF "$(GUI)"=="WIN"
! # using 32-bit tools 
! GREP=$(SOLARROOT)$/util$/nt$/grep32.exe
! FIND=$(SOLARROOT)$/util$/nt$/find.exe
! LS=$(SOLARROOT)$/util$/nt$/ls.exe
! MKDIRHIER=echo v | xcopy nul 
! .ENDIF
! .ELSE
! SED*=sed
! AWK=awk
! SORT*=sort
! PERL=perl
! TYPE=cat
! COPY=cp -f
! COPYRECURSE=-r
! GNUCOPY=cp
! TOUCH=touch
! RENAME=mv
! MKDIR=mkdir
! MKDIRHIER=mkdir -p
! GREP=grep
! FIND=find
! LS=ls
! ECHON=echo -n
! ECHONL=echo
! .ENDIF
! .ELSE
  SED*=sed
  SORT*=sort
  PERL=perl
--- 97,107 ----
  RENAME*=ren
  TOUCH*=$(BUILD_TOOLS)$/touch.exe
  TYPE*=type
! .ENDIF  "$(USE_SHELL)"!="4nt"
  MKDIRHIER=$(MKDIR) 
  SCP_CHECK_TOOL=checkscp.exe
  
! .ELIF "$(GUI)"=="UNX"	# "$(GUI)"=="WNT"
  SED*=sed
  SORT*=sort
  PERL=perl
***************
*** 164,170 ****
  LS=ls
  ECHON=echo -n
  ECHONL=echo
! .ENDIF
  
  MAKEDEPEND*=$(WRAPCMD) makedepend
  
--- 131,137 ----
  LS=ls
  ECHON=echo -n
  ECHONL=echo
! .ENDIF			# "$(GUI)"=="UNX"
  
  MAKEDEPEND*=$(WRAPCMD) makedepend
  
***************
*** 173,181 ****
  .IF "$(GUI)"=="UNX"
  SCP_CHECK_TOOL=checkscp
  NULLDEV=/dev/null
! .ELIF "$(GUI)"=="MAC"
  NULLDEV=/dev/null
  .ELSE
  NULLDEV=nul
  .ENDIF
  
--- 140,150 ----
  .IF "$(GUI)"=="UNX"
  SCP_CHECK_TOOL=checkscp
  NULLDEV=/dev/null
! .ELIF "$(GUI)"=="WNT"
! .IF "$(USE_SHELL)"!="4nt"
  NULLDEV=/dev/null
  .ELSE
  NULLDEV=nul
+ .ENDIF
  .ENDIF