Fix rabbitmq-components.mk path when publishing to hex pm

Author: HoloRin

deps/rabbit_common/mk/rabbitmq-hexpm.mk

@@ -30,35 +30,30 @@ define RABBITMQ_HEXPM_DEFAULT_FILES
 	    "src"
 endef
 
-ifeq ($(PROJECT),rabbit_common)
-RMQ_COMPONENTS_PREFIX = mk
-RMQ_COMPONENTS_HEXPM = mk/rabbitmq-components.hexpm.mk
-else
-RMQ_COMPONENTS_PREFIX = .
+RMQ_COMPONENTS_PLAIN = $(DEPS_DIR)/../rabbitmq-components.mk
 RMQ_COMPONENTS_HEXPM = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.hexpm.mk
-endif
 
 hex-publish: $(HEXPM_CLI) app rebar.config
 	$(gen_verbose) echo "$(PROJECT_DESCRIPTION) $(PROJECT_VERSION)" \
 		> git-revisions.txt
 	$(verbose) mv \
-		$(RMQ_COMPONENTS_PREFIX)/rabbitmq-components.mk \
+		$(RMQ_COMPONENTS_PLAIN) \
 		rabbitmq-components.mk.not-hexpm
 	$(verbose) cp \
 		$(RMQ_COMPONENTS_HEXPM) \
-		$(RMQ_COMPONENTS_PREFIX)/rabbitmq-components.mk
+		$(RMQ_COMPONENTS_PLAIN)
 	$(verbose) grep -E '^dep.* = hex' \
 		rabbitmq-components.mk.not-hexpm \
-		>> $(RMQ_COMPONENTS_PREFIX)/rabbitmq-components.mk
+		>> $(RMQ_COMPONENTS_PLAIN)
 	$(verbose) touch -r \
 		rabbitmq-components.mk.not-hexpm \
-		$(RMQ_COMPONENTS_PREFIX)/rabbitmq-components.mk
+		$(RMQ_COMPONENTS_PLAIN)
 	$(verbose) trap '\
 		rm -f git-revisions.txt rebar.lock; \
 		if test -f rabbitmq-components.mk.not-hexpm; then \
 		  mv \
 		    rabbitmq-components.mk.not-hexpm \
-		    $(RMQ_COMPONENTS_PREFIX)/rabbitmq-components.mk; \
+		    $(RMQ_COMPONENTS_PLAIN); \
 		fi' EXIT INT; \
 		$(HEXPM_CLI) publish