From 07ecf11d15147062a239445ddeff6a0a938da18d Mon Sep 17 00:00:00 2001
From: David Wragg <dpw@lshift.net>
Date: Tue, 18 Aug 2009 11:10:40 +0100
Subject: [PATCH] Invoke make as $(MAKE) from within makefiles

Our makefiles require gnumake.  Under some unices, gnumake is
installed as gmake, with plain "make" referring to a something less
featureful.  So it's necessary to invoke make as $(MAKE) from within
makefiles, in order to make sure we invoke the same variant.
---
 Makefile                        | 2 +-
 packaging/generic-unix/Makefile | 4 ++--
 packaging/windows/Makefile      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 125ebc711b..080324f270 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ srcdist: distclean
 	rm -rf $(TARGET_SRC_DIR)
 
 distclean: clean
-	make -C $(AMQP_CODEGEN_DIR) distclean
+	$(MAKE) -C $(AMQP_CODEGEN_DIR) distclean
 	rm -rf dist
 	find . -regex '.*\(~\|#\|\.swp\|\.dump\)' -exec rm {} \;
 
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index b398869693..4eade6c744 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -4,10 +4,10 @@ TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_TARBALL=rabbitmq-server-generic-unix-$(VERSION)
 
 dist:
-	make -C ../.. VERSION=$(VERSION) srcdist
+	$(MAKE) -C ../.. VERSION=$(VERSION) srcdist
 	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
 
-	make -C $(SOURCE_DIR) \
+	$(MAKE) -C $(SOURCE_DIR) \
 		TARGET_DIR=`pwd`/$(TARGET_DIR) \
 		SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \
 		MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 28f7931907..387becb333 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -4,9 +4,9 @@ TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_ZIP=rabbitmq-server-windows-$(VERSION)
 
 dist:
-	make -C ../.. VERSION=$(VERSION) srcdist
+	$(MAKE) -C ../.. VERSION=$(VERSION) srcdist
 	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
-	make -C $(SOURCE_DIR)
+	$(MAKE) -C $(SOURCE_DIR)
 
 	mkdir $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmq-server.bat $(SOURCE_DIR)/sbin