diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-10 14:03:26 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-10 14:03:26 +0100 |
| commit | 9c102b3fdd2a2bfe3047f6c1ebb0e52bb9d14bba (patch) | |
| tree | f6b35b3ace5a9f8e7da22c6f3f9076ae9b633eb2 | |
| parent | c021b62f80c42c385501f2441752bbee464c1bd4 (diff) | |
| parent | b8509aa8f37df2f6241cb4edba4ccb848ec7861a (diff) | |
| download | rabbitmq-server-9c102b3fdd2a2bfe3047f6c1ebb0e52bb9d14bba.tar.gz | |
Merging bug 22850 onto default
| -rw-r--r-- | Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -70,6 +70,12 @@ define usage_dep $(call usage_xml_to_erl, $(1)): $(1) $(DOCS_DIR)/usage.xsl endef +ifneq "$(SBIN_DIR)" "" +ifneq "$(TARGET_DIR)" "" +SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR)) +endif +endif + all: $(TARGETS) $(DEPS_FILE): $(SOURCES) $(INCLUDES) @@ -234,13 +240,7 @@ $(SOURCE_DIR)/%_usage.erl: docs_all: $(MANPAGES) $(WEB_MANPAGES) -install: SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR)) install: all docs_all install_dirs - @[ -n "$(TARGET_DIR)" ] || (echo "Please set TARGET_DIR."; false) - @[ -n "$(SBIN_DIR)" ] || (echo "Please set SBIN_DIR."; false) - @[ -n "$(MAN_DIR)" ] || (echo "Please set MAN_DIR."; false) - - mkdir -p $(TARGET_DIR) cp -r ebin include LICENSE LICENSE-MPL-RabbitMQ INSTALL $(TARGET_DIR) chmod 0755 scripts/* @@ -256,8 +256,14 @@ install: all docs_all install_dirs done install_dirs: - mkdir -p $(SBIN_DIR) + @ OK=true && \ + { [ -n "$(TARGET_DIR)" ] || { echo "Please set TARGET_DIR."; OK=false; }; } && \ + { [ -n "$(SBIN_DIR)" ] || { echo "Please set SBIN_DIR."; OK=false; }; } && \ + { [ -n "$(MAN_DIR)" ] || { echo "Please set MAN_DIR."; OK=false; }; } && $$OK + mkdir -p $(TARGET_DIR)/sbin + mkdir -p $(SBIN_DIR) + mkdir -p $(MAN_DIR) $(foreach XML, $(USAGES_XML), $(eval $(call usage_dep, $(XML)))) |