summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2017-02-13 16:28:26 +0300
committerGitHub <noreply@github.com>2017-02-13 16:28:26 +0300
commite01aff8c523fe74b3a1f6c8a755376b05d3e4abf (patch)
tree40eefe31c0ae7f1ddae3f59eb99826edda5a5ebb /Makefile
parent753739f5e16c237bbcf9eaa264fc2459b8b668b7 (diff)
parentcb1842a596536d80add33b15f6eab97018774a6f (diff)
downloadrabbitmq-server-git-e01aff8c523fe74b3a1f6c8a755376b05d3e4abf.tar.gz
Merge pull request #1101 from rabbitmq/fix-escript-hardlinks-copy
Makefile: Use rabbitmq-cli's Makefile `install` target
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6d808adaf0..dbe9d55545 100644
--- a/Makefile
+++ b/Makefile
@@ -141,10 +141,6 @@ EXTRA_SOURCES += $(USAGES_ERL)
.DEFAULT_GOAL = all
$(PROJECT).d:: $(EXTRA_SOURCES)
-copy-escripts:
- cp -r ${DEPS_DIR}/rabbitmq_cli/escript ./
-
-
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
rabbit_common/mk/rabbitmq-dist.mk \
rabbit_common/mk/rabbitmq-run.mk \
@@ -182,13 +178,22 @@ USE_PROPER_QC := $(shell $(ERL) -eval 'io:format({module, proper} =:= code:ensur
RMQ_ERLC_OPTS += $(if $(filter true,$(USE_PROPER_QC)),-Duse_proper_qc)
endif
+.PHONY: copy-escripts clean-extra-sources clean-escripts
+
+CLI_ESCRIPTS_DIR = escript
+
+copy-escripts:
+ $(gen_verbose) $(MAKE) -C $(DEPS_DIR)/rabbitmq_cli install \
+ PREFIX="$(abspath $(CLI_ESCRIPTS_DIR))" \
+ DESTDIR=
+
clean:: clean-extra-sources clean-escripts
clean-extra-sources:
$(gen_verbose) rm -f $(EXTRA_SOURCES)
clean-escripts:
- $(gen_verbose) rm -rf escript
+ $(gen_verbose) rm -rf "$(CLI_ESCRIPTS_DIR)"
# --------------------------------------------------------------------
# Documentation.