summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2018-02-22 18:10:47 +0100
committerQuentin Young <qlyoung@cumulusnetworks.com>2018-02-22 18:10:47 +0100
commit6165030aa827c89e508ae7fcb30cee9988babbc9 (patch)
tree96a8a88ffdc99e7f1b668f3c3d06215d80c15b51
parentdoc: fallback to sphinx-1.0-build (diff)
downloadfrr-6165030aa827c89e508ae7fcb30cee9988babbc9.tar.xz
frr-6165030aa827c89e508ae7fcb30cee9988babbc9.zip
doc: fix hardcoded 'make' invocation
BSD systems need gmake to build FRR, hence why we use $(MAKE) instead of directly invoking make. It looks like Sphinx generated makefiles understand this, but contain a bug where the target for info files hardcodes make instead of using $(MAKE). Fix this. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
-rw-r--r--doc/developer/Makefile2
-rw-r--r--doc/user/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index e04e17d38..329e455de 100644
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -172,7 +172,7 @@ texinfo:
info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
- make -C $(BUILDDIR)/texinfo info
+ $(MAKE) -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
.PHONY: gettext
diff --git a/doc/user/Makefile b/doc/user/Makefile
index e04e17d38..329e455de 100644
--- a/doc/user/Makefile
+++ b/doc/user/Makefile
@@ -172,7 +172,7 @@ texinfo:
info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
- make -C $(BUILDDIR)/texinfo info
+ $(MAKE) -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
.PHONY: gettext