| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. |
| 2 | |
| 3 | However, if some of this content is regenerated at configure time this can happen: |
| 4 | |
| 5 | 1) configure writes new build/version.xml |
| 6 | 2) make compile copies content, including the tarball's src/version.xml |
| 7 | to build/version.xml, and generates gtk-doc. |
| 8 | 3) make install notices build/version.xml is older than configure.status, |
| 9 | so regenerates gtk-doc. |
| 10 | |
| 11 | gtk-doc generation is a slow process at the best of times, so doing it twice isn't good. |
| 12 | |
| 13 | Solve this by changing cp --force to cp --no-clobber, so setup-build only copies |
| 14 | files which don't already exist. |
| 15 | |
| 16 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] |
| 17 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 18 | |
| 19 | diff --git a/gtk-doc.make b/gtk-doc.make |
| 20 | index f87eaab..246f3c0 100644 |
| 21 | --- a/gtk-doc.make |
| 22 | +++ b/gtk-doc.make |
| 23 | @@ -113,3 +113,3 @@ setup-build.stamp: |
| 24 | test -f $(abs_srcdir)/$$file && \ |
| 25 | - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ |
| 26 | + cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ |
| 27 | done; \ |