blob: d1695479dc02b940d6194b4a2a1e070e846f1c24 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 21 Mar 2018 14:47:29 +0000
4Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install
5
Brad Bishop316dfdd2018-06-25 12:45:53 -04006In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir.
7
8However, if some of this content is regenerated at configure time this can happen:
9
101) configure writes new build/version.xml
112) make compile copies content, including the tarball's src/version.xml
12 to build/version.xml, and generates gtk-doc.
133) make install notices build/version.xml is older than configure.status,
14 so regenerates gtk-doc.
15
16gtk-doc generation is a slow process at the best of times, so doing it twice isn't good.
17
18Solve this by changing cp --force to cp --no-clobber, so setup-build only copies
19files which don't already exist.
20
21Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571]
22Signed-off-by: Ross Burton <ross.burton@intel.com>
23
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080024---
25 buildsystems/autotools/gtk-doc.make | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make
29index 7d9a27f..8cb336d 100644
30--- a/buildsystems/autotools/gtk-doc.make
31+++ b/buildsystems/autotools/gtk-doc.make
32@@ -111,7 +111,7 @@ setup-build.stamp:
33 destdir=`dirname $(abs_builddir)/$$file`; \
34 test -d "$$destdir" || mkdir -p "$$destdir"; \
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 test -f $(abs_srcdir)/$$file && \
36- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
37+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
38 done; \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080039 fi; \
40 fi