]> git.puffer.fish Git - mirror/frr.git/commitdiff
doc: Use `mv -f` in Makefile 3105/head
authorChristian Franke <chris@opensourcerouting.org>
Fri, 28 Sep 2018 17:32:38 +0000 (19:32 +0200)
committerChristian Franke <chris@opensourcerouting.org>
Fri, 28 Sep 2018 17:36:19 +0000 (19:36 +0200)
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>
doc/subdir.am

index 41701016559e06c238eea06edb39948df73fca0d..7d3792bf2bd224544d021685c1d26449d39434b3 100644 (file)
@@ -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 $@ \
        )
 
 #