guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Taylan Ulrich Bayırlı/Kammer
Subject: Re: [PATCH] build: Fix out-of-tree building of documentation.
Date: Sun, 10 Jan 2016 11:34:45 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

address@hidden (Taylan Ulrich "Bayırlı/Kammer") writes:

>  .png.eps:
> -     convert "$<" "address@hidden"
> -     mv "address@hidden" "$@"
> +     convert "$<" "$(srcdir)/address@hidden"
> +     mv "$(srcdir)/address@hidden" "$(srcdir)/$@"

Whoops, looks like that rule mustn't be changed.

Updated patch:

>From 80c928d93b9f87e227684a53dc4ce4477698c86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <address@hidden>
Date: Sun, 10 Jan 2016 10:14:43 +0100
Subject: [PATCH] build: Fix out-of-tree building of documentation.

* doc.am (.dot.png, .dot.pdf, .dot.eps): Put the generated files into
  $(srcdir).
---
 doc.am | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc.am b/doc.am
index e3a91cc..8a5cfdc 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 <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 # Copyright © 2013 Andreas Enge <address@hidden>
+# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <address@hidden>
 #
 # This file is part of GNU Guix.
 #
@@ -65,16 +66,16 @@ DOT_OPTIONS =                                       \
   -Nfontsize=9 -Nheight=.1 -Nwidth=.1
 
 .dot.png:
-       $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "address@hidden"
-       mv "address@hidden" "$@"
+       $(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/address@hidden"
+       mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
 
 .dot.pdf:
-       $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "address@hidden"
-       mv "address@hidden" "$@"
+       $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/address@hidden"
+       mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
 
 .dot.eps:
-       $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "address@hidden"
-       mv "address@hidden" "$@"
+       $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/address@hidden"
+       mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
 
 .png.eps:
        convert "$<" "address@hidden"
-- 
2.6.3


reply via email to

[Prev in Thread] Current Thread [Next in Thread]