unzip

Author: dumbbell

deps/rabbit_common/mk/rabbitmq-dist.mk

@@ -200,12 +200,10 @@ do-dist:: $(DIST_EZS)
 	$(verbose) unwanted='$(filter-out $(DIST_EZS) $(EXTRA_DIST_EZS), \
 		$(wildcard $(DIST_DIR)/*))'; \
 	test -z "$$unwanted" || (echo " RM     $$unwanted" && rm -rf $$unwanted)
-	$(verbose) unzip -d "$(DIST_DIR)" \
-		-x 'csv*' \
-		-x 'json*' \
-		-x 'stdout_formatter*' \
-		-o \
-		$(CLI_ESCRIPTS_DIR)/rabbitmqctl
+	$(verbose) unzip -o -d "$(DIST_DIR)" "$(CLI_ESCRIPTS_DIR)/rabbitmqctl" || :
+	$(verbose) rm -rf "$(DIST_DIR)"/csv
+	$(verbose) rm -rf "$(DIST_DIR)"/json
+	$(verbose) rm -rf "$(DIST_DIR)"/stdout_formatter
 
 CLI_SCRIPTS_LOCK = $(CLI_SCRIPTS_DIR).lock
 CLI_ESCRIPTS_LOCK = $(CLI_ESCRIPTS_DIR).lock