diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-18 11:10:40 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-18 11:10:40 +0100 |
| commit | be3cf7a037c9f09c340a4409fcd9ccd09a131c67 (patch) | |
| tree | 0bb2c54181395ccb3ad387be045c47979f0f2708 | |
| parent | 3b3067dc17a9f042b9916e35540fc98c2adc91c2 (diff) | |
| download | rabbitmq-server-be3cf7a037c9f09c340a4409fcd9ccd09a131c67.tar.gz | |
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.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 4 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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 b3988696..4eade6c7 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 28f79319..387becb3 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 |