summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-19 13:39:56 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-19 13:39:56 +0100
commit40fc81848bdbe38456890cc37f946919b8caa76f (patch)
treefd9e00b2718caf83035780d0d27f981ab014e132 /Makefile
parent2dbd7b51439827b62ee7bdd9c94fa0d69be2d119 (diff)
downloadrabbitmq-server-git-40fc81848bdbe38456890cc37f946919b8caa76f.tar.gz
rename provided_plugins to plugins-dist
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 2ea3405fcf..2e1e93d964 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_m
VERSION=0.0.0
PLUGINS_SRC_DIR?=$(shell [ -d "plugins-src" ] && echo "plugins-src" || echo )
-PLUGINS_DIST_DIR?=provided_plugins
+PLUGINS_DIST_DIR=plugins-dist
TARBALL_NAME=rabbitmq-server-$(VERSION)
TARGET_SRC_DIR=dist/$(TARBALL_NAME)
@@ -108,8 +108,8 @@ ifneq "$(PLUGINS_SRC_DIR)" ""
plugins:
[ -d "$(PLUGINS_SRC_DIR)" ] || { echo "No plugins source distribution found (try linking public-umbrella to $(PLUGINS_SRC_DIR)"; false; }
-ln -s $(CURDIR) "$(PLUGINS_SRC_DIR)/rabbitmq-server"
- mkdir -p provided_plugins
- PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/provided_plugins" VERSION=$(VERSION)
+ mkdir -p $(PLUGINS_DIST_DIR)
+ PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/$(PLUGINS_DIST_DIR)" VERSION=$(VERSION)
else
plugins:
# Not building plugins
@@ -157,7 +157,7 @@ $(BASIC_PLT): $(BEAM_TARGETS)
clean:
rm -f $(EBIN_DIR)/*.beam
rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
- rm -f provided_plugins/*.ez
+ rm -f $(PLUGINS_DIST_DIR)/*.ez
-PLUGINS_SRC_DIR="" PRESERVE_CLONE_DIR=1 make -C $(PLUGINS_SRC_DIR) clean
rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL)
@@ -308,8 +308,8 @@ install_bin: all install_dirs
done
mkdir -p $(TARGET_DIR)/plugins
echo Put your .ez plugin files in this directory. > $(TARGET_DIR)/plugins/README
- mkdir -p $(TARGET_DIR)/provided_plugins
- -cp $(PLUGINS_DIST_DIR)/*.ez $(TARGET_DIR)/provided_plugins
+ mkdir -p $(TARGET_DIR)/$(PLUGINS_DIST_DIR)
+ -cp $(PLUGINS_DIST_DIR)/*.ez $(TARGET_DIR)/$(PLUGINS_DIST_DIR)
install_docs: docs_all install_dirs
for section in 1 5; do \