diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-09-13 10:27:54 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-09-13 10:27:54 +0100 |
| commit | 330cb4de45aa966a6570018fa17a612329ac2b4e (patch) | |
| tree | 79f77f629f9f29ad30011f2c204198bcb85476aa | |
| parent | f00552788a9eb8e9a11e2bc4bf515cbacbc26a99 (diff) | |
| download | rabbitmq-server-git-330cb4de45aa966a6570018fa17a612329ac2b4e.tar.gz | |
tweak handling of the doc install dir
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 |
2 files changed, 3 insertions, 3 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/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 075c5fa04b..1f10e363a3 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -48,7 +48,7 @@ rm -rf %{buildroot} make install TARGET_DIR=%{_maindir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ - MAN_DIR=%{buildroot}%{_mandir} + MAN_DIR=%{buildroot}%{_mandir} \ mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq |