On 02/08/2016 11:18 PM, Ben Pfaff wrote:
> In particular this ensures that the sub-make that dist-docs runs has the
> benefit of any parallelism flags passed into the top-level make.
>
> Signed-off-by: Ben Pfaff <b...@ovn.org>
> ---
> Makefile.am | 2 +-
> build-aux/dist-docs | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 4ca5e9c..75ccadf 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -408,7 +408,7 @@ if LINUX_ENABLED
> endif
>
> dist-docs:
> - VERSION=$(VERSION) $(srcdir)/build-aux/dist-docs $(srcdir) $(docs)
> + VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs
> $(srcdir) $(docs)
> .PHONY: dist-docs
>
> include Documentation/automake.mk
> diff --git a/build-aux/dist-docs b/build-aux/dist-docs
> index 3792fa5..1aeefa7 100755
> --- a/build-aux/dist-docs
> +++ b/build-aux/dist-docs
> @@ -44,7 +44,7 @@ rm -rf $distdir
> mkdir $distdir
>
> # Install manpages.
> -make install-man mandir="$abs_distdir"/man
> +${MAKE-make} install-man mandir="$abs_distdir"/man
> (cd $distdir && mv `find man -type f` . && rm -rf man)
> manpages=`cd $distdir && echo *`
>
>
I'm running "make -j5 dist-docs". In both changes, ${MAKE} only
evaluates to "make", so this doesn't seem to do what the commit message
says. Maybe you're building in a different way?
--
Russell Bryant
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
