From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: [PATCH] build: Fix out-of-tree building of documentation. Date: Sun, 10 Jan 2016 10:49:33 +0100 Message-ID: <87a8odydaq.fsf@T420.taylan> References: <87fuy6ydmj.fsf@T420.taylan> <87vb72784u.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aICd0-00020y-U6 for guix-devel@gnu.org; Sun, 10 Jan 2016 04:49:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aICcy-0001Sk-0I for guix-devel@gnu.org; Sun, 10 Jan 2016 04:49:38 -0500 In-Reply-To: <87vb72784u.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sat, 09 Jan 2016 22:30:57 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > taylanbayirli@gmail.com (Taylan Ulrich "Bay=C4=B1rl=C4=B1/Kammer") skribi= s: > >> From 41650754511487f5f1f937317eebd80c19ca8bf1 Mon Sep 17 00:00:00 2001 >> From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer= ?=3D >> >> 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? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-build-Fix-out-of-tree-building-of-documentation.patch Content-Transfer-Encoding: quoted-printable >From 8e5f869674334b2f13373abfaf3c72b7bb446c7b Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?=3D 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 =C2=A9 2012, 2013, 2014, 2015 Ludovic Court=C3=A8s +# Copyright =C2=A9 2012, 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s # Copyright =C2=A9 2013 Andreas Enge +# Copyright =C2=A9 2016 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer # # This file is part of GNU Guix. # @@ -65,20 +66,20 @@ DOT_OPTIONS =3D \ -Nfontsize=3D9 -Nheight=3D.1 -Nwidth=3D.1 =20 .dot.png: - $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp" - mv "$@.tmp" "$@" + $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" =20 .dot.pdf: - $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$@.tmp" - mv "$@.tmp" "$@" + $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" =20 .dot.eps: - $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp" - mv "$@.tmp" "$@" + $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" =20 .png.eps: - convert "$<" "$@-tmp.eps" - mv "$@-tmp.eps" "$@" + convert "$<" "$(srcdir)/$@-tmp.eps" + mv "$(srcdir)/$@-tmp.eps" "$(srcdir)/$@" =20 # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake) # Extending"). Using the `-local' rules is imperfect, because they may be --=20 2.6.3 --=-=-=--