[PATCH] build: fix race in parallel builds
Hongxu Jia <[email protected]>
| Newsgroups | gmane.comp.sysutils.automake.patches |
|---|---|
| Message-ID | <[email protected]> |
The automake-$(APIVERSION) is a hardlink of automake, if it is created later than update_mans executing, there is a failure [snip] |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl ../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16 |help2man: can't get `--help' info from aclocal-1.16 |Try `--no-discard-stderr' if option outputs to stderr Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed [snip] The automake_script is required by update_mans and update_mans invokes automake-$(APIVERSION) rather than automake to generate doc, so we should assign `automake-$(APIVERSION)' to automake_script. The same reason to tweak aclocal_script. * bin/local.mk: correct automake_script/aclocal_script Signed-off-by: Hongxu Jia <[email protected]> --- bin/local.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/local.mk b/bin/local.mk index 97b38db..058ca99 100644 --- a/bin/local.mk +++ b/bin/local.mk @@ -31,8 +31,8 @@ CLEANFILES += \ # Used by maintainer checks and such. automake_in = $(srcdir)/%D%/automake.in aclocal_in = $(srcdir)/%D%/aclocal.in -automake_script = %D%/automake -aclocal_script = %D%/aclocal +automake_script = %D%/automake-$(APIVERSION) +aclocal_script = %D%/aclocal-$(APIVERSION) AUTOMAKESOURCES = $(automake_in) $(aclocal_in) TAGS_FILES += $(AUTOMAKESOURCES) -- 2.10.2