summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xcalculate-relative2
-rw-r--r--packaging/generic-unix/Makefile4
-rw-r--r--packaging/windows/Makefile4
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1dcf736279..f070275681 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,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/calculate-relative b/calculate-relative
index 3c3e2b1ff6..3af18e8ff8 100755
--- a/calculate-relative
+++ b/calculate-relative
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# relpath.py
# R.Barran 30/08/2004
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