From 19c6c3310b9d4317a339dfa3173e8c98ea779772 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@canonical.com>
Date: Wed, 1 Nov 2017 23:04:26 +0000
Subject: [PATCH] all: Use the MAKE variable

https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html

We should be using the $(MAKE) variable when calling the make command
from Makefiles since we use Makefile recursion.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 Makefile                        | 16 ++++++++--------
 changehat/mod_apparmor/Makefile |  2 +-
 parser/tst/Makefile             |  2 +-
 tests/Makefile                  |  2 +-
 tests/regression/Makefile       |  2 +-
 tests/stress/Makefile           |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 028dbc26d..63ef23960 100644
--- a/Makefile
+++ b/Makefile
@@ -40,23 +40,23 @@ TAR_EXCLUSIONS=
 .PHONY: tarball
 tarball: clean
 	REPO_VERSION=`$(value REPO_VERSION_CMD)` && \
-	make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} && \
-	make setup __SETUP_DIR=${RELEASE_DIR} && \
+	$(MAKE) export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} && \
+	$(MAKE) setup __SETUP_DIR=${RELEASE_DIR} && \
 	tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
 
 .PHONY: snapshot
 snapshot: clean
 	$(eval REPO_VERSION:=$(shell $(value REPO_VERSION_CMD)))
 	$(eval SNAPSHOT_NAME=apparmor-$(VERSION)~$(REPO_VERSION))
-	make export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} && \
-	make setup __SETUP_DIR=${SNAPSHOT_NAME} && \
+	$(MAKE) export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} && \
+	$(MAKE) setup __SETUP_DIR=${SNAPSHOT_NAME} && \
 	tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME}
 
 .PHONY: coverity
 coverity: snapshot
 	cd $(SNAPSHOT_NAME)/libraries/libapparmor && ./configure --with-python
 	$(foreach dir, $(filter-out utils profiles tests, $(DIRS)), \
-		cov-build --dir $(COVERITY_DIR) -- make -C $(SNAPSHOT_NAME)/$(dir);)
+		cov-build --dir $(COVERITY_DIR) -- $(MAKE) -C $(SNAPSHOT_NAME)/$(dir);)
 	tar -cvzf $(SNAPSHOT_NAME)-$(COVERITY_DIR).tar.gz $(COVERITY_DIR)
 
 .PHONY: export_dir
@@ -69,18 +69,18 @@ export_dir:
 clean:
 	-rm -rf ${RELEASE_DIR} ./apparmor-${VERSION}~* ${COVERITY_DIR}
 	for dir in $(DIRS); do \
-		make -C $$dir clean; \
+		$(MAKE) -C $$dir clean; \
 	done
 
 .PHONY: setup
 setup:
 	cd $(__SETUP_DIR)/libraries/libapparmor && ./autogen.sh
 	# parser has an extra doc to build
-	make -C $(__SETUP_DIR)/parser extra_docs
+	$(MAKE) -C $(__SETUP_DIR)/parser extra_docs
 	# libraries/libapparmor needs configure to have run before
 	# building docs
 	$(foreach dir, $(filter-out libraries/libapparmor tests, $(DIRS)), \
-		make -C $(__SETUP_DIR)/$(dir) docs;)
+		$(MAKE) -C $(__SETUP_DIR)/$(dir) docs;)
 
 .PHONY: tag
 tag:
diff --git a/changehat/mod_apparmor/Makefile b/changehat/mod_apparmor/Makefile
index a51114f41..65c9c75ae 100644
--- a/changehat/mod_apparmor/Makefile
+++ b/changehat/mod_apparmor/Makefile
@@ -87,7 +87,7 @@ docs: ${MANPAGES} ${HTMLMANPAGES}
 install: ${TARGET} ${MANPAGES}
 	mkdir -p ${DESTDIR}/${APXS_INSTALL_DIR}
 	install -m 755 $< ${DESTDIR}/${APXS_INSTALL_DIR}
-	make install_manpages DESTDIR=${DESTDIR}
+	$(MAKE) install_manpages DESTDIR=${DESTDIR}
 
 .PHONY: clean
 clean: pod_clean
diff --git a/parser/tst/Makefile b/parser/tst/Makefile
index ad0e79183..4a06c6af7 100644
--- a/parser/tst/Makefile
+++ b/parser/tst/Makefile
@@ -57,7 +57,7 @@ valgrind: $(PARSER) gen_xtrans gen_dbus
 	LANG=C ./valgrind_simple.py -p "$(PARSER)" -v simple_tests
 
 $(PARSER):
-	make -C $(PARSER_DIR) $(PARSER_BIN)
+	$(MAKE) -C $(PARSER_DIR) $(PARSER_BIN)
 
 clean:
 	find $(GEN_TRANS_DIRS) -type f | xargs rm -f
diff --git a/tests/Makefile b/tests/Makefile
index 1fddf9b8b..3ce69bd4c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,5 +3,5 @@ SUBDIRS=regression stress
 .PHONY: clean
 clean:
 	for dir in $(SUBDIRS) ; do \
-		make clean -C $${dir} ; \
+		$(MAKE) clean -C $${dir} ; \
 	done
diff --git a/tests/regression/Makefile b/tests/regression/Makefile
index 0551dc4f1..fb756f20f 100644
--- a/tests/regression/Makefile
+++ b/tests/regression/Makefile
@@ -3,5 +3,5 @@ SUBDIRS=apparmor
 .PHONY: clean
 clean:
 	for dir in $(SUBDIRS) ; do \
-		make clean -C $${dir} ; \
+		$(MAKE) clean -C $${dir} ; \
 	done
diff --git a/tests/stress/Makefile b/tests/stress/Makefile
index f46fb127c..e7bef13df 100644
--- a/tests/stress/Makefile
+++ b/tests/stress/Makefile
@@ -3,5 +3,5 @@ SUBDIRS=subdomain
 .PHONY: clean
 clean:
 	for dir in $(SUBDIRS) ; do \
-		make clean -C $${dir} ; \
+		$(MAKE) clean -C $${dir} ; \
 	done