Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Wed, 21 Mar 2018 14:47:29 +0000 |
| 4 | Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install |
| 5 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 6 | In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. |
| 7 | |
| 8 | However, if some of this content is regenerated at configure time this can happen: |
| 9 | |
| 10 | 1) configure writes new build/version.xml |
| 11 | 2) make compile copies content, including the tarball's src/version.xml |
| 12 | to build/version.xml, and generates gtk-doc. |
| 13 | 3) make install notices build/version.xml is older than configure.status, |
| 14 | so regenerates gtk-doc. |
| 15 | |
| 16 | gtk-doc generation is a slow process at the best of times, so doing it twice isn't good. |
| 17 | |
| 18 | Solve this by changing cp --force to cp --no-clobber, so setup-build only copies |
| 19 | files which don't already exist. |
| 20 | |
| 21 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] |
| 22 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 23 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | --- |
| 25 | buildsystems/autotools/gtk-doc.make | 2 +- |
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 27 | |
| 28 | diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make |
| 29 | index 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 Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 35 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 39 | fi; \ |
| 40 | fi |