root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
David Wragg 2009-08-18 11:10:40 +01:00
parent fde61026f7
commit 07ecf11d15
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 {} \;

4
packaging/generic-unix/Makefile
View File

@ -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 \

4
packaging/windows/Makefile
View File

@ -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