summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-09-13 10:23:34 +0100
committerTim Watson <tim@rabbitmq.com>2013-09-13 10:23:34 +0100
commite785a0510ab03083438ec6de21d505c6915fe04f (patch)
tree6174246354fe79f048e408b53db135da3f94b0e7
parent330cb4de45aa966a6570018fa17a612329ac2b4e (diff)
downloadrabbitmq-server-git-e785a0510ab03083438ec6de21d505c6915fe04f.tar.gz
resolve merge conflicts
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 1f10e363a3..73d13bc303 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -49,6 +49,7 @@ rm -rf %{buildroot}
make install TARGET_DIR=%{_maindir} \
SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
MAN_DIR=%{buildroot}%{_mandir} \
+ DOC_INSTALL_DIR=%{buildroot}/etc
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq