diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-09-13 10:23:34 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-09-13 10:23:34 +0100 |
| commit | b70331dd0e131c874465e805873a86318d4fd9d4 (patch) | |
| tree | 6174246354fe79f048e408b53db135da3f94b0e7 | |
| parent | ae9aa71e5e4a983613be7e19512fd3f819cfb637 (diff) | |
| download | rabbitmq-server-b70331dd0e131c874465e805873a86318d4fd9d4.tar.gz | |
resolve merge conflicts
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 1f10e363..73d13bc3 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 |