Re: [PATCH] build: Fix out-of-tree building of documentation.

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> From 41650754511487f5f1f937317eebd80c19ca8bf1 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Sat, 9 Jan 2016 15:56:23 +0100
> Subject: [PATCH] build: Fix out-of-tree building of documentation.
>
> * doc.am (.dot.png, .dot.pdf, .dot.eps, .png.eps): Create the directory
>   for each target in case of out-of-tree building.

The files in $(DOT_VECTOR_GRAPHICS) are part of the distribution.  Thus,
when building from a tarball, they are in $(srcdir), not in $(builddir).

However, when building from Git out-of-tree, they should go do $(srcdir)
as well (as is done for Info files.)

A fix would be:


[-- Attachment #2: Type: text/x-patch, Size: 830 bytes --]

diff --git a/doc.am b/doc.am
index e3a91cc..21b08be 100644
--- a/doc.am
+++ b/doc.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
@@ -66,15 +66,15 @@ DOT_OPTIONS =					\
 
 .dot.png:
 	$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp"
-	mv "$@.tmp" "$@"
+	mv "$@.tmp" "$(srcdir)/$@"
 
 .dot.pdf:
 	$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$@.tmp"
-	mv "$@.tmp" "$@"
+	mv "$@.tmp" "$(srcdir)/$@"
 
 .dot.eps:
 	$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
-	mv "$@.tmp" "$@"
+	mv "$@.tmp" "$(srcdir)/$@"
 
 .png.eps:
 	convert "$<" "$@-tmp.eps"

[-- Attachment #3: Type: text/plain, Size: 37 bytes --]


Does it work for you?

Ludo’.