From e2cea5fc249272e38f9cd4b23faa7f44667b6525 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Mon, 11 Aug 2014 10:59:13 +0100 Subject: autotools: proper fix for generated Makevars and distcheck Reverts 21da4a54545cd6871d1d888566ce9fe488afef67. It is needed to generate Makevars in-tree even when building out-of-tree because of how Autotools work. However, distcheck doesn't properly remove the Makevars file in the generated distdir and makes po/ read only, preventing the build system from generating an up-to-date version of Makevars. This commit adds the required hooks needed to fix this behavior. --- Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 41a6bf3ee9..3b5ea42697 100644 --- a/Makefile.am +++ b/Makefile.am @@ -431,5 +431,14 @@ pkgbuild:: clean-local: rm -rf benchmark coverage +# Makevars is generated in top source directory, even for out-of-tree distclean-local: - rm -f po/Makevars + rm -f $(top_srcdir)/po/Makevars + +# we need this to remove Makevars from dist +dist-hook: + rm -f $(distdir)/po/Makevars + +# in dist tree po is read only, and we need to generate Makevars in there +distcheck-hook: + chmod +w $(distdir)/po -- cgit v1.2.1