diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-09-19 10:58:04 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-09-19 10:58:04 +0100 |
| commit | 89650cc6f50eb97c5c7e62f06721c2fc3665a7ec (patch) | |
| tree | 6af820f4605aee6f3b44ec873f2f9aad5caf9721 | |
| parent | 068843e15919d0ce85c042aa7c30a83dea0c77f1 (diff) | |
| parent | 769e50d5be6c651136893ea570f62f3b1757e646 (diff) | |
| download | rabbitmq-server-89650cc6f50eb97c5c7e62f06721c2fc3665a7ec.tar.gz | |
merge heads
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docs/rabbitmq.sample.config | 4 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rules | 1 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 2 | ||||
| -rw-r--r-- | packaging/standalone/Makefile | 2 |
5 files changed, 6 insertions, 7 deletions
@@ -341,7 +341,7 @@ install_docs: docs_all install_dirs cp $$manpage $(MAN_DIR)/man$$section; \ done; \ done - cp $(DOCS_DIR)/rabbitmq.sample.config $(DOC_INSTALL_DIR)/rabbitmq.sample.config + $(ifneq $(DOC_INSTALL_DIR),,$(shell cp $(DOCS_DIR)/rabbitmq.sample.config $(DOC_INSTALL_DIR)/rabbitmq.sample.config)) install_dirs: @ OK=true && \ @@ -352,7 +352,7 @@ install_dirs: mkdir -p $(TARGET_DIR)/sbin mkdir -p $(SBIN_DIR) mkdir -p $(MAN_DIR) - mkdir -p $(DOC_INSTALL_DIR) + $(ifneq $(DOC_INSTALL_DIR),,$(shell mkdir -p $(DOC_INSTALL_DIR))) $(foreach XML,$(USAGES_XML),$(eval $(call usage_dep, $(XML)))) diff --git a/docs/rabbitmq.sample.config b/docs/rabbitmq.sample.config index 0f2272e6..cf6e70ea 100644 --- a/docs/rabbitmq.sample.config +++ b/docs/rabbitmq.sample.config @@ -95,7 +95,7 @@ %% %% Misc/Advanced Options: %% - %% NB: Change these only if you understand what you're doing! + %% NB: Change these only if you understand what you are doing! %% %% How to respond to cluster partitions. @@ -221,7 +221,7 @@ %% Listen for SSL connections on 61613. %% {ssl_listeners, [61613]}, - %% Extract name from client's certificate when using SSL. + %% Extract name from client certificate when using SSL. %% {ssl_cert_login, true}, %% Use cn instead of dn when reading from the SSL cert. diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules index b9de9041..a1498979 100644 --- a/packaging/debs/Debian/debian/rules +++ b/packaging/debs/Debian/debian/rules @@ -8,7 +8,6 @@ RABBIT_BIN=$(DEB_DESTDIR)usr/lib/rabbitmq/bin/ DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/ DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) DOC_INSTALL_DIR=$(DOCDIR) MAN_DIR=$(DEB_DESTDIR)usr/share/man/ -MAN_DIR=$(DEB_DESTDIR)usr/share/man/ DEB_MAKE_CLEAN_TARGET:= distclean install/rabbitmq-server:: diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index 202234eb..84a09a2a 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -10,7 +10,7 @@ dist: TARGET_DIR=`pwd`/$(TARGET_DIR) \ SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \ MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ - DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/share/doc/rabbitmq-server \ + DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \ install sed -e 's:^SYS_PREFIX=$$:SYS_PREFIX=\$${RABBITMQ_HOME}:' \ diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile index f5da249e..3788da99 100644 --- a/packaging/standalone/Makefile +++ b/packaging/standalone/Makefile @@ -24,7 +24,7 @@ dist: TARGET_DIR=`pwd`/$(TARGET_DIR) \ SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \ MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ - DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/share/doc/rabbitmq-server \ + DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \ install ## Here we set the RABBITMQ_HOME variable, |