diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-02-09 12:05:10 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-02-09 13:11:01 +0100 |
| commit | cb1842a596536d80add33b15f6eab97018774a6f (patch) | |
| tree | 58dc8111b942754bba72dbf6784b760ea433a3ff | |
| parent | f8ef1a73e872ad9b3e3a8936b0ddc18217cbe2ba (diff) | |
| download | rabbitmq-server-git-cb1842a596536d80add33b15f6eab97018774a6f.tar.gz | |
Makefile: Use rabbitmq-cli's Makefile new install target
The local recipe was moved and adapted to rabbitmq-cli. This allows to
get rid of any knowledge of rabbitmq-cli layout.
Furthermore, package building will be able to use that target too
instead of copying this copy again. Therefore each package can use
hardlinks or symlinks independently.
[#138925175]
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -178,17 +178,12 @@ endif .PHONY: copy-escripts clean-extra-sources clean-escripts -ESCRIPT_COPIES_DIR = escript - -# We want to copy the `escript` directory in rabbitmq_cli locally. We -# use pax(1) for that. pax(1) is a little weird to use (we need to cd to -# the source directory) but its behavior is consistent accross systems, -# unlike cp(1), in particular w.r.t. hardlinks handling. +CLI_ESCRIPTS_DIR = escript copy-escripts: - $(gen_verbose) mkdir -p $(ESCRIPT_COPIES_DIR) - $(verbose) cd $(DEPS_DIR)/rabbitmq_cli/escript && \ - pax -rw . $(abspath $(ESCRIPT_COPIES_DIR)) + $(gen_verbose) $(MAKE) -C $(DEPS_DIR)/rabbitmq_cli install \ + PREFIX="$(abspath $(CLI_ESCRIPTS_DIR))" \ + DESTDIR= clean:: clean-extra-sources clean-escripts @@ -196,7 +191,7 @@ clean-extra-sources: $(gen_verbose) rm -f $(EXTRA_SOURCES) clean-escripts: - $(gen_verbose) rm -rf "$(ESCRIPT_COPIES_DIR)" + $(gen_verbose) rm -rf "$(CLI_ESCRIPTS_DIR)" # -------------------------------------------------------------------- # Documentation. |