[email protected] (Ludovic Courtès) writes: > [email protected] (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?= >> <[email protected]> >> 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: > > [...]
That doesn't solve the problem that the directories for the .tmp files don't exist. Does the following look right?
>From 8e5f869674334b2f13373abfaf3c72b7bb446c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= <[email protected]> Date: Sun, 10 Jan 2016 10:14:43 +0100 Subject: [PATCH 1/2] build: Fix out-of-tree building of documentation. * doc.am (.dot.png, .dot.pdf, .dot.eps, .png.eps): Put the generated files into $(srcdir). --- doc.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doc.am b/doc.am index e3a91cc..49d35c2 100644 --- a/doc.am +++ b/doc.am @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <[email protected]> +# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <[email protected]> # Copyright © 2013 Andreas Enge <[email protected]> +# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <[email protected]> # # This file is part of GNU Guix. # @@ -65,20 +66,20 @@ DOT_OPTIONS = \ -Nfontsize=9 -Nheight=.1 -Nwidth=.1 .dot.png: - $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "[email protected]" - mv "[email protected]" "$@" + $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/[email protected]" + mv "$(srcdir)/[email protected]" "$(srcdir)/$@" .dot.pdf: - $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "[email protected]" - mv "[email protected]" "$@" + $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/[email protected]" + mv "$(srcdir)/[email protected]" "$(srcdir)/$@" .dot.eps: - $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "[email protected]" - mv "[email protected]" "$@" + $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/[email protected]" + mv "$(srcdir)/[email protected]" "$(srcdir)/$@" .png.eps: - convert "$<" "[email protected]" - mv "[email protected]" "$@" + convert "$<" "$(srcdir)/[email protected]" + mv "$(srcdir)/[email protected]" "$(srcdir)/$@" # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake) # Extending"). Using the `-local' rules is imperfect, because they may be -- 2.6.3
