summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--packaging/windows/Makefile3
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 517df80f08..626f6999dc 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ plugins:
[ -d "$(PLUGINS_SRC_DIR)" ] || { echo "No plugins source distribution found (try linking public-umbrella to $(PLUGINS_SRC_DIR)"; false; }
-ln -s .. "$(PLUGINS_SRC_DIR)/rabbitmq-server"
mkdir -p provided_plugins
- $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/provided_plugins" VERSION=$(VERSION)
+ PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/provided_plugins" VERSION=$(VERSION)
else
plugins:
# Not building plugins
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 959f762366..e06ae98d13 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -21,12 +21,11 @@ dist:
mkdir -p $(TARGET_DIR)
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
xmlto -o . xhtml-nochunks ../../docs/rabbitmq-service.xml
elinks -dump -no-references -no-numbering rabbitmq-service.html \
> $(TARGET_DIR)/readme-service.txt
todos $(TARGET_DIR)/readme-service.txt
+ rm -f $(TARGET_DIR)/plugins-src/rabbitmq-server
zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
rm -rf $(TARGET_DIR) rabbitmq-service.html