From: tcely <tcely@users.noreply.github.com>
Date: Tue, 1 Aug 2017 04:11:45 +0000 (-0400)
Subject: Actually fix the mans conflict.
X-Git-Tag: dnsdist-1.4.0-rc3~42^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=430697159b94553679ee43542157d5c78ca99690;p=thirdparty%2Fpdns.git

Actually fix the mans conflict.

This was a parallel build problem.
I had misunderstood what was actually happening when I first read the logs.
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 98418a1a82..f7faa7d143 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -62,8 +62,7 @@ EXTRA_DIST = $(MANPAGES_DIST)
 if HAVE_VIRTUALENV
 if !HAVE_MANPAGES
 $(MANPAGES_DIST): %: manpages/%.rst .venv
-	.venv/bin/python -msphinx -b man . mans $<
-	mv mans/$@ $@; rm -rf mans
+	outputdir="`mktemp -d mans.XXXX`"; .venv/bin/python -msphinx -b man . "$$outputdir" "$<" && mv "$${outputdir}/$@" "$@"; rm -rf "$$outputdir"
 endif # if !HAVE_MANPAGES
 
 .venv: requirements.txt