Skip to content

Commit 9b7d55e

Browse files
RestorerZchrisbra
authored andcommitted
runtime(doc): update Makefile and make it portable between GNU and BSD
by removing the non-portable GNU variable and using $? instead Note: this only works for rules with single dependencies. closes: #15493 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent bc11f6d commit 9b7d55e

1 file changed

Lines changed: 40 additions & 37 deletions

File tree

runtime/doc/Makefile

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ doctags: doctags.c
3535
$(CC) doctags.c -o doctags
3636

3737
vim.man: vim.1
38-
nroff -man $< | sed -e s/.//g > $@
38+
nroff -man $? | sed -e s/.//g > $@
3939

4040
evim.man: evim.1
41-
nroff -man $< | sed -e s/.//g > $@
41+
nroff -man $? | sed -e s/.//g > $@
4242

4343
vimdiff.man: vimdiff.1
44-
nroff -man $< | sed -e s/.//g > $@
44+
nroff -man $? | sed -e s/.//g > $@
4545

4646
vimtutor.man: vimtutor.1
47-
nroff -man $< | sed -e s/.//g > $@
47+
nroff -man $? | sed -e s/.//g > $@
4848

4949
xxd.man: xxd.1
50-
nroff -man $< | sed -e s/.//g > $@
50+
nroff -man $? | sed -e s/.//g > $@
5151

5252
uganda.nsis.txt : uganda.???
5353
for dpn in $?; do \
@@ -74,10 +74,10 @@ $(HTMLS): tags.ref
7474
# index.html is the starting point for HTML, but for the help files it is
7575
# help.txt. Therefore use vimindex.html for index.txt.
7676
index.html: help.txt
77-
$(AWK) -f makehtml.awk $< >$@
77+
$(AWK) -f makehtml.awk $? >$@
7878

7979
vimindex.html: index.txt
80-
$(AWK) -f makehtml.awk $< >$@
80+
$(AWK) -f makehtml.awk $? >$@
8181

8282
tags.ref tags.html: tags
8383
$(AWK) -f maketags.awk tags >tags.html
@@ -151,88 +151,91 @@ os_risc.txt:
151151
os_win32.txt:
152152
touch $@
153153

154-
# Note that $< works with GNU make while $> works for BSD make.
155-
# Is there a solution that works for both??
154+
# In *BSD, the variable '$<' is used in suffix-transformation rules (in GNU this
155+
# is called "implicit rules", and in MS Windows it is called "inference rules").
156+
# For code portability, it is better to use the '$?' variable for explicit rules.
157+
# Especially since there is only one dependency and it should presumably always
158+
# be newer than the target file.
156159
vim-da.UTF-8.1: vim-da.1
157-
iconv -f latin1 -t utf-8 $< >$@
160+
iconv -f latin1 -t UTF-8 $? >$@
158161

159162
vimdiff-da.UTF-8.1: vimdiff-da.1
160-
iconv -f latin1 -t utf-8 $< >$@
163+
iconv -f latin1 -t UTF-8 $? >$@
161164

162165
vimtutor-da.UTF-8.1: vimtutor-da.1
163-
iconv -f latin1 -t utf-8 $< >$@
166+
iconv -f latin1 -t UTF-8 $? >$@
164167

165168
vim-de.UTF-8.1: vim-de.1
166-
iconv -f latin1 -t utf-8 $< >$@
169+
iconv -f latin1 -t UTF-8 $? >$@
167170

168171
vim-fr.UTF-8.1: vim-fr.1
169-
iconv -f latin1 -t utf-8 $< >$@
172+
iconv -f latin1 -t UTF-8 $? >$@
170173

171174
evim-fr.UTF-8.1: evim-fr.1
172-
iconv -f latin1 -t utf-8 $< >$@
175+
iconv -f latin1 -t UTF-8 $? >$@
173176

174177
vimdiff-fr.UTF-8.1: vimdiff-fr.1
175-
iconv -f latin1 -t utf-8 $< >$@
178+
iconv -f latin1 -t UTF-8 $? >$@
176179

177180
vimtutor-fr.UTF-8.1: vimtutor-fr.1
178-
iconv -f latin1 -t utf-8 $< >$@
181+
iconv -f latin1 -t UTF-8 $? >$@
179182

180183
xxd-fr.UTF-8.1: xxd-fr.1
181-
iconv -f latin1 -t utf-8 $< >$@
184+
iconv -f latin1 -t UTF-8 $? >$@
182185

183186
vim-it.UTF-8.1: vim-it.1
184-
iconv -f latin1 -t utf-8 $< >$@
187+
iconv -f latin1 -t UTF-8 $? >$@
185188

186189
evim-it.UTF-8.1: evim-it.1
187-
iconv -f latin1 -t utf-8 $< >$@
190+
iconv -f latin1 -t UTF-8 $? >$@
188191

189192
vimdiff-it.UTF-8.1: vimdiff-it.1
190-
iconv -f latin1 -t utf-8 $< >$@
193+
iconv -f latin1 -t UTF-8 $? >$@
191194

192195
vimtutor-it.UTF-8.1: vimtutor-it.1
193-
iconv -f latin1 -t utf-8 $< >$@
196+
iconv -f latin1 -t UTF-8 $? >$@
194197

195198
xxd-it.UTF-8.1: xxd-it.1
196-
iconv -f latin1 -t utf-8 $< >$@
199+
iconv -f latin1 -t UTF-8 $? >$@
197200

198201
vim-pl.UTF-8.1: vim-pl.1
199-
iconv -f latin2 -t utf-8 $< >$@
202+
iconv -f latin2 -t UTF-8 $? >$@
200203

201204
evim-pl.UTF-8.1: evim-pl.1
202-
iconv -f latin2 -t utf-8 $< >$@
205+
iconv -f latin2 -t UTF-8 $? >$@
203206

204207
vimdiff-pl.UTF-8.1: vimdiff-pl.1
205-
iconv -f latin2 -t utf-8 $< >$@
208+
iconv -f latin2 -t UTF-8 $? >$@
206209

207210
vimtutor-pl.UTF-8.1: vimtutor-pl.1
208-
iconv -f latin2 -t utf-8 $< >$@
211+
iconv -f latin2 -t UTF-8 $? >$@
209212

210213
xxd-pl.UTF-8.1: xxd-pl.1
211-
iconv -f latin2 -t utf-8 $< >$@
214+
iconv -f latin2 -t UTF-8 $? >$@
212215

213216
vim-ru.UTF-8.1: vim-ru.1
214-
iconv -f KOI8-R -t utf-8 $< >$@
217+
iconv -f KOI8-R -t UTF-8 $? >$@
215218

216219
evim-ru.UTF-8.1: evim-ru.1
217-
iconv -f KOI8-R -t utf-8 $< >$@
220+
iconv -f KOI8-R -t UTF-8 $? >$@
218221

219222
vimdiff-ru.UTF-8.1: vimdiff-ru.1
220-
iconv -f KOI8-R -t utf-8 $< >$@
223+
iconv -f KOI8-R -t UTF-8 $? >$@
221224

222225
vimtutor-ru.UTF-8.1: vimtutor-ru.1
223-
iconv -f KOI8-R -t utf-8 $< >$@
226+
iconv -f KOI8-R -t UTF-8 $? >$@
224227

225228
xxd-ru.UTF-8.1: xxd-ru.1
226-
iconv -f KOI8-R -t utf-8 $< >$@
229+
iconv -f KOI8-R -t UTF-8 $? >$@
227230

228231
vim-tr.UTF-8.1: vim-tr.1
229-
iconv -f latin5 -t utf-8 $< >$@
232+
iconv -f latin5 -t UTF-8 $? >$@
230233

231234
evim-tr.UTF-8.1: evim-tr.1
232-
iconv -f latin5 -t utf-8 $< >$@
235+
iconv -f latin5 -t UTF-8 $? >$@
233236

234237
vimdiff-tr.UTF-8.1: vimdiff-tr.1
235-
iconv -f latin5 -t utf-8 $< >$@
238+
iconv -f latin5 -t UTF-8 $? >$@
236239

237240
vimtutor-tr.UTF-8.1: vimtutor-tr.1
238-
iconv -f latin5 -t utf-8 $< >$@
241+
iconv -f latin5 -t UTF-8 $? >$@

0 commit comments

Comments
 (0)