[FFmpeg-cvslog] build: fix doc generation errors in parallel builds

Mans Rullgard git at videolan.org
Thu Mar 29 04:32:34 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue Mar 27 22:42:41 2012 +0100| [2efb710a3432f1bab381ed66fbae42c7d638e2c9] | committer: Mans Rullgard

build: fix doc generation errors in parallel builds

The $(dir) function used to construct OBJDIRS includes a trailing slash
in the names returned, which GNU make 3.82 does not match to the
slash-less 'doc' in the documentation dependencies, causing parallel
build to fail.  Adding a slash fixes this and still works with make
3.81.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2efb710a3432f1bab381ed66fbae42c7d638e2c9
---

 doc/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index ffb3c5c..15e7323 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -40,7 +40,7 @@ doc/%.1: TAG = MAN
 doc/%.1: doc/%.pod $(GENTEXI)
 	$(M)pod2man --section=1 --center=" " --release=" " $< > $@
 
-$(DOCS): | doc
+$(DOCS): | doc/
 
 install-progs-$(CONFIG_DOC): install-man
 



More information about the ffmpeg-cvslog mailing list