View | Details | Raw Unified | Return to issue 12061
Collapse All | Expand All

(-)solenv/inc/unitools.mk (-10 / +12 lines)
Lines 59-66 Link Here
59
#
59
#
60
#
60
#
61
#*************************************************************************
61
#*************************************************************************
62
.IF "$(GUI)"!="UNX"
62
.IF "$(GUI)"=="WNT" || "$(GUI)"=="WIN"
63
.IF "$(GUI)"!="MAC"
64
AWK*=awk
63
AWK*=awk
65
SORT*=sort
64
SORT*=sort
66
SED*=sed
65
SED*=sed
Lines 81-87 Link Here
81
RENAME*=mv
80
RENAME*=mv
82
TOUCH*=touch
81
TOUCH*=touch
83
TYPE*=cat
82
TYPE*=cat
84
.ELSE
83
.ELSE			# "$(USE_SHELL)"!="4nt"
85
COPY*=copy
84
COPY*=copy
86
COPYRECURSE=/s
85
COPYRECURSE=/s
87
COPYUPDATE=/u
86
COPYUPDATE=/u
Lines 98-104 Link Here
98
RENAME*=ren
97
RENAME*=ren
99
TOUCH*=$(BUILD_TOOLS)$/touch.exe
98
TOUCH*=$(BUILD_TOOLS)$/touch.exe
100
TYPE*=type
99
TYPE*=type
101
.ENDIF
100
.ENDIF  "$(USE_SHELL)"!="4nt"
102
MKDIRHIER=$(MKDIR) 
101
MKDIRHIER=$(MKDIR) 
103
.IF "$(GUI)"=="WNT"
102
.IF "$(GUI)"=="WNT"
104
SCP_CHECK_TOOL=checkscp.exe
103
SCP_CHECK_TOOL=checkscp.exe
Lines 107-121 Link Here
107
SIGNCODE=$(BUILD_TOOLS)$/PackSign$/signcode
106
SIGNCODE=$(BUILD_TOOLS)$/PackSign$/signcode
108
CABARC=$(BUILD_TOOLS)$/PackSign$/cabarc
107
CABARC=$(BUILD_TOOLS)$/PackSign$/cabarc
109
SIGNTOOL=$(BUILD_TOOLS)$/signtool$/signtool
108
SIGNTOOL=$(BUILD_TOOLS)$/signtool$/signtool
110
.ENDIF
109
.ENDIF			# "$(GUI)"=="WNT"
111
.IF "$(GUI)"=="WIN"
110
.IF "$(GUI)"=="WIN"
112
# using 32-bit tools 
111
# using 32-bit tools 
113
GREP=$(SOLARROOT)$/util$/nt$/grep32.exe
112
GREP=$(SOLARROOT)$/util$/nt$/grep32.exe
114
FIND=$(SOLARROOT)$/util$/nt$/find.exe
113
FIND=$(SOLARROOT)$/util$/nt$/find.exe
115
LS=$(SOLARROOT)$/util$/nt$/ls.exe
114
LS=$(SOLARROOT)$/util$/nt$/ls.exe
116
MKDIRHIER=echo v | xcopy nul 
115
MKDIRHIER=echo v | xcopy nul 
117
.ENDIF
116
.ENDIF			# "$(GUI)"=="WIN"
118
.ELSE
117
118
.ELIF "$(GUI)"!="MAC"	# "$(GUI)"=="WNT" || "$(GUI)"=="WIN"
119
SED*=sed
119
SED*=sed
120
AWK=awk
120
AWK=awk
121
SORT*=sort
121
SORT*=sort
Lines 133-140 Link Here
133
LS=ls
133
LS=ls
134
ECHON=echo -n
134
ECHON=echo -n
135
ECHONL=echo
135
ECHONL=echo
136
.ENDIF
136
137
.ELSE
137
.ELIF "$(GUI)"=="UNX"	# "$(GUI)"=="MAC"
138
SED*=sed
138
SED*=sed
139
SORT*=sort
139
SORT*=sort
140
PERL=perl
140
PERL=perl
Lines 164-170 Link Here
164
LS=ls
164
LS=ls
165
ECHON=echo -n
165
ECHON=echo -n
166
ECHONL=echo
166
ECHONL=echo
167
.ENDIF
167
.ENDIF			# "$(GUI)"=="UNX"
168
168
169
MAKEDEPEND*=$(WRAPCMD) makedepend
169
MAKEDEPEND*=$(WRAPCMD) makedepend
170
170
Lines 174-179 Link Here
174
SCP_CHECK_TOOL=checkscp
174
SCP_CHECK_TOOL=checkscp
175
NULLDEV=/dev/null
175
NULLDEV=/dev/null
176
.ELIF "$(GUI)"=="MAC"
176
.ELIF "$(GUI)"=="MAC"
177
NULLDEV=/dev/null
178
.ELIF "$(GUI)"=="WNT" && $(USE_SHELL)"!="4nt"
177
NULLDEV=/dev/null
179
NULLDEV=/dev/null
178
.ELSE
180
.ELSE
179
NULLDEV=nul
181
NULLDEV=nul

Return to issue 12061