Skip to content

Commit 471e7b2

Browse files
felipecgitster
felipec
authored and
gitster
committed
doc: remove unnecessary rm instances
Commits 50cff52 (When generating manpages, delete outdated targets first., 2007-08-02) and f928676 (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>
1 parent 56da213 commit 471e7b2

File tree

1 file changed

+15
-27
lines changed

1 file changed

+15
-27
lines changed

‎Documentation/Makefile‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ docdep_prereqs = \
296296
cmd-list.made $(cmds_txt)
297297

298298
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) && \
301300
mv $@+ $@
302301

303302
ifneq ($(MAKECMDGOALS),clean)
@@ -318,16 +317,15 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
318317
$(cmds_txt): cmd-list.made
319318

320319
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) && \
323321
date >$@
324322

325323
mergetools_txt = mergetools-diff.txt mergetools-merge.txt
326324

327325
$(mergetools_txt): mergetools-list.made
328326

329327
mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
330-
$(QUIET_GEN)$(RM) $@ && \
328+
$(QUIET_GEN) \
331329
$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
332330
. ../git-mergetool--lib.sh && \
333331
show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
@@ -357,30 +355,25 @@ clean:
357355
$(RM) GIT-ASCIIDOCFLAGS
358356

359357
$(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 $@+ $< && \
362359
mv $@+ $@
363360

364361
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
365-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
366-
$(TXT_TO_HTML) -o $@+ $< && \
362+
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \
367363
mv $@+ $@
368364

369365
manpage-base-url.xsl: manpage-base-url.xsl.in
370366
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
371367

372368
%.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 $<
375370

376371
%.xml : %.txt $(ASCIIDOC_DEPS)
377-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
378-
$(TXT_TO_XML) -d manpage -o $@+ $< && \
372+
$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \
379373
mv $@+ $@
380374

381375
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 $@+ $< && \
384377
mv $@+ $@
385378

386379
technical/api-index.txt: technical/api-index-skel.txt \
@@ -402,27 +395,24 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
402395
XSLTOPTS += --param generate.consistent.ids 1
403396

404397
user-manual.html: user-manual.xml $(XSLT)
405-
$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
406-
xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
398+
$(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
407399
mv $@+ $@
408400

409401
git.info: user-manual.texi
410402
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
411403

412404
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 >$@++ && \
415406
$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
416407
rm $@++ && \
417408
mv $@+ $@
418409

419410
user-manual.pdf: user-manual.xml
420-
$(QUIET_DBLATEX)$(RM) $@+ $@ && \
421-
$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
411+
$(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
422412
mv $@+ $@
423413

424414
gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
425-
$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
415+
$(QUIET_DB2TEXI) \
426416
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
427417
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
428418
rm $(xml)+ &&) true) > $@++ && \
@@ -434,13 +424,11 @@ gitman.info: gitman.texi
434424
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
435425

436426
$(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 >$@+ && \
439428
mv $@+ $@
440429

441430
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)) >$@+ && \
444432
mv $@+ $@
445433

446434
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
@@ -450,7 +438,7 @@ WEBDOC_DEST = /pub/software/scm/git/docs
450438

451439
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
452440
$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
453-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
441+
$(QUIET_ASCIIDOC) \
454442
sed -e '1,/^$$/d' $< | \
455443
$(TXT_TO_HTML) - >$@+ && \
456444
mv $@+ $@

0 commit comments

Comments
 (0)