diff options
| author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2015-02-03 14:32:06 +0100 |
|---|---|---|
| committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2015-02-03 14:32:06 +0100 |
| commit | 2a38e52b08b9595736d14380b2f189d68fb20c6e (patch) | |
| tree | 865452dc10e2d23ea4579b29b2dda07a9aa6d3d8 | |
| parent | f0681f34782b3ef800759a5bd1536e2acb154ef6 (diff) | |
| download | rabbitmq-server-git-2a38e52b08b9595736d14380b2f189d68fb20c6e.tar.gz | |
Don't install rabbitmq.config.example is DOC_INSTALL_DIR is unset
This reverts commit d795910d2127.
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 9 |
2 files changed, 8 insertions, 12 deletions
@@ -366,19 +366,22 @@ install_docs: docs_all install_dirs cp $$manpage $(MAN_DIR)/man$$section; \ done; \ done - cp $(DOCS_DIR)/rabbitmq.config.example $(DOC_INSTALL_DIR)/rabbitmq.config.example + if test "$(DOC_INSTALL_DIR)"; then \ + cp $(DOCS_DIR)/rabbitmq.config.example $(DOC_INSTALL_DIR)/rabbitmq.config.example; \ + fi install_dirs: @ 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; }; } && \ - { [ -n "$(DOC_INSTALL_DIR)" ] || { echo "Please set DOC_INSTALL_DIR."; OK=false; }; } && $$OK + { [ -n "$(MAN_DIR)" ] || { echo "Please set MAN_DIR."; OK=false; }; } && $$OK mkdir -p $(TARGET_DIR)/sbin mkdir -p $(SBIN_DIR) mkdir -p $(MAN_DIR) - mkdir -p $(DOC_INSTALL_DIR) + if test "$(DOC_INSTALL_DIR)"; then \ + mkdir -p $(DOC_INSTALL_DIR); \ + fi $(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 f8fc557cda..af1e4f421b 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -48,12 +48,9 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -# Note that we pass /tmp to DOC_INSTALL_DIR here because we're using %doc -# to actually install rabbitmq.config.example, so this is just a fake/temp path make install TARGET_DIR=%{_maindir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ - MAN_DIR=%{buildroot}%{_mandir} \ - DOC_INSTALL_DIR=/tmp + MAN_DIR=%{buildroot}%{_mandir} mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq @@ -129,10 +126,6 @@ done %clean rm -rf %{buildroot} -# rabbitmq.config.example (%doc) was copied to /tmp (DOC_INSTALL_DIR) -# during make install. -rm -f /tmp/rabbitmq.config.example - %changelog * Tue Jan 6 2015 jean-sebastien@rabbitmq.com 3.4.3-1 - New Upstream Release |