diff options
| author | Marek Majkowski <majek@lshift.net> | 2009-08-20 15:22:55 +0100 |
|---|---|---|
| committer | Marek Majkowski <majek@lshift.net> | 2009-08-20 15:22:55 +0100 |
| commit | d54b3cce513fc6c1cf9420b2cd424268c74e261f (patch) | |
| tree | 61973dd05bffec40f6e5f91d2df9937027c0fe99 | |
| parent | 49157676d8179402e9474e80ed25e8aa6f95087c (diff) | |
| parent | 551063399a9921a6313ee3f79f708daf019ef9d1 (diff) | |
| download | rabbitmq-server-git-d54b3cce513fc6c1cf9420b2cd424268c74e261f.tar.gz | |
(freebsd stuff) bug21432 merged into default
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | calculate-relative | 2 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 4 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -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 |