When GNU make sees that a command to be executed contains the string
$(MAKE), it makes the jobserver that limits parallelism available to
the command. Otherwise, any sub-make that executes sees that
parallelism is enabled but does not have access to the jobserver, so
it prints a warning and turns off parallel job execution.
This also makes the dist-docs process run the same "make" that is
executed at the top level, in case that's different from the default
"make" found in $PATH.
Signed-off-by: Ben Pfaff <b...@ovn.org>
---
v1->v2: Rewrite commit message.
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 *`
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
