From d1ddda7e75fdc24b68830b16ea0c2179436e4886 Mon Sep 17 00:00:00 2001 From: Maksim Stsepanenka Date: Wed, 29 Mar 2017 01:20:32 +0300 Subject: [PATCH] make: use the variable MAKE for recursive calls Closes #1366 --- Makefile.am | 6 +++--- docs/Makefile.am | 6 +++--- docs/libcurl/Makefile.am | 4 ++-- src/Makefile.am | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44a7931882..8ad806b48a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -171,10 +171,10 @@ dist-hook: done) html: - cd docs && make html + cd docs && $(MAKE) html pdf: - cd docs && make pdf + cd docs && $(MAKE) pdf check: test examples check-docs @@ -256,7 +256,7 @@ rpm: # gak - libtool requires an absolute directory, hence the pwd below... pkgadd: umask 022 ; \ - make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ + $(MAKE) install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ cat COPYING > $(srcdir)/packages/Solaris/copyright ; \ cd $(srcdir)/packages/Solaris && $(MAKE) package diff --git a/docs/Makefile.am b/docs/Makefile.am index 98ea293103..f57c00ea16 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -47,13 +47,13 @@ MAN2HTML= roffit $< >$@ SUFFIXES = .1 .html .pdf curl.1: - cd cmdline-opts && make + cd cmdline-opts && $(MAKE) html: $(HTMLPAGES) - cd libcurl && make html + cd libcurl && $(MAKE) html pdf: $(PDFPAGES) - cd libcurl && make pdf + cd libcurl && $(MAKE) pdf .1.html: $(MAN2HTML) diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am index 035e12eb4f..26fe6c68e3 100644 --- a/docs/libcurl/Makefile.am +++ b/docs/libcurl/Makefile.am @@ -48,13 +48,13 @@ libcurl-symbols.3: $(srcdir)/symbols-in-versions $(srcdir)/mksymbolsmanpage.pl perl $(srcdir)/mksymbolsmanpage.pl < $(srcdir)/symbols-in-versions > $@ html: $(HTMLPAGES) - cd opts && make html + cd opts && $(MAKE) html .3.html: $(MAN2HTML) pdf: $(PDFPAGES) - cd opts && make pdf + cd opts && $(MAKE) pdf .3.pdf: @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \ diff --git a/src/Makefile.am b/src/Makefile.am index 088a9f2c05..b59fb8786a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,7 +101,7 @@ if USE_MANUAL # Here are the stuff to create a built-in manual $(MANPAGE): - cd $(top_builddir)/docs && make curl.1 + cd $(top_builddir)/docs && $(MAKE) curl.1 if HAVE_LIBZ # This generates the tool_hugehelp.c file in both uncompressed and