From: Christian Franke <chris@opensourcerouting.org>
Date: Fri, 28 Sep 2018 17:32:38 +0000 (+0200)
Subject: doc: Use `mv -f` in Makefile
X-Git-Tag: frr-7.1-dev~309^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1eab76b985b91f5ac173338af511d20bf008029a;p=mirror%2Ffrr.git

doc: Use `mv -f` in Makefile

Sphinx always runs, even in the `make install` stage. When `make install`
is run as root and then another `make` is run by a nonprivileged user,
some versions of `mv` prompt like this:

    mv: replace 'doc/manpages/_build/man/man.stamp',
                 overriding mode 0644 (rw-r--r--)?

Add -f to `mv` to avoid this. As `-f` is part of Posix, this should be
portable enough.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/doc/subdir.am b/doc/subdir.am
index 4170101655..7d3792bf2b 100644
--- a/doc/subdir.am
+++ b/doc/subdir.am
@@ -56,7 +56,7 @@ doc/%/_build/man/man.stamp: doc/%/_build/.doctrees/environment.pickle
 		$(MKDIR_P) "$${subdoc}/_build/man"; touch $@.tmp; \
 		$(SPHINXBUILD) -a -q -b man -d "$${subdoc}/_build/.doctrees" \
 			$(ALLSPHINXOPTS) "$(top_srcdir)/$${subdoc}" "$${subdoc}/_build/man" && \
-			mv $@.tmp $@ \
+			mv -f $@.tmp $@ \
 	)
 
 #