doc: remove unnecessary rm instances
Commits 50cff52f1a (When generating manpages, delete outdated targets first., 2007-08-02) and f9286765b2 (Documentation/Makefile: remove cmd-list.made before redirecting to it., 2007-08-06) created these rm instances for a very rare corner-case: building as root by mistake. It's odd to have workarounds here, but nowhere else in the Makefile-- which already fails in this stuation, starting from Documentation/technical/. We gain nothing but complexity, so let's remove them. Comments-by: Jeff King <peff@peff.net> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 21, 2021 at 17:29 UTC
471e7b2cf6ab5ef057feed03b35dde9a26357611
1 file changed
+15
-27
Documentation/Makefile
+15
-27
@@ -296,8 +296,7 @@ docdep_prereqs = \
296
cmd-list.made $(cmds_txt)
297
298
doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl
299
- $(QUIET_GEN)$(RM) $@+ $@ && \
300
- $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
299
+ $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
300
mv $@+ $@
301
302
ifneq ($(MAKECMDGOALS),clean)
@@ -318,8 +317,7 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
317
$(cmds_txt): cmd-list.made
318
319
cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
321
- $(QUIET_GEN)$(RM) $@ && \
322
- $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \
320
+ $(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \
321
date >$@
322
323
mergetools_txt = mergetools-diff.txt mergetools-merge.txt
@@ -327,7 +325,7 @@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt
325
$(mergetools_txt): mergetools-list.made
326
327
mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
330
- $(QUIET_GEN)$(RM) $@ && \
328
+ $(QUIET_GEN) \
329
$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
330
. ../git-mergetool--lib.sh && \
331
show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
@@ -357,30 +355,25 @@ clean:
355
$(RM) GIT-ASCIIDOCFLAGS
356
357
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
360
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
361
- $(TXT_TO_HTML) -d manpage -o $@+ $< && \
358
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@+ $< && \
359
mv $@+ $@
360
361
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
365
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
366
- $(TXT_TO_HTML) -o $@+ $< && \
362
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \
363
mv $@+ $@
364
365
manpage-base-url.xsl: manpage-base-url.xsl.in
366
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
367
368
%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
373
- $(QUIET_XMLTO)$(RM) $@ && \
374
- $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
369
+ $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
370
371
%.xml : %.txt $(ASCIIDOC_DEPS)
377
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
378
- $(TXT_TO_XML) -d manpage -o $@+ $< && \
372
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \
373
mv $@+ $@
374
375
user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
382
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
383
- $(TXT_TO_XML) -d book -o $@+ $< && \
376
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@+ $< && \
377
mv $@+ $@
378
379
technical/api-index.txt: technical/api-index-skel.txt \
@@ -402,27 +395,24 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
395
XSLTOPTS += --param generate.consistent.ids 1
396
397
user-manual.html: user-manual.xml $(XSLT)
405
- $(QUIET_XSLTPROC)$(RM) $@+ $@ && \
406
- xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
398
+ $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
399
mv $@+ $@
400
401
git.info: user-manual.texi
402
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
403
404
user-manual.texi: user-manual.xml
413
- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
414
- $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
405
+ $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
406
$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
407
rm $@++ && \
408
mv $@+ $@
409
410
user-manual.pdf: user-manual.xml
420
- $(QUIET_DBLATEX)$(RM) $@+ $@ && \
421
- $(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
411
+ $(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
412
mv $@+ $@
413
414
gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
425
- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
415
+ $(QUIET_DB2TEXI) \
416
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
417
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
418
rm $(xml)+ &&) true) > $@++ && \
@@ -434,13 +424,11 @@ gitman.info: gitman.texi
424
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
425
426
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
437
- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
438
- $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
427
+ $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
428
mv $@+ $@
429
430
howto-index.txt: howto-index.sh $(HOWTO_TXT)
442
- $(QUIET_GEN)$(RM) $@+ $@ && \
443
- '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
431
+ $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
432
mv $@+ $@
433
434
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
@@ -450,7 +438,7 @@ WEBDOC_DEST = /pub/software/scm/git/docs
438
439
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
440
$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
453
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
441
+ $(QUIET_ASCIIDOC) \
442
sed -e '1,/^$$/d' $< | \
443
$(TXT_TO_HTML) - >$@+ && \
444
mv $@+ $@