Merge bug17940

5 files changed, 14 insertions, 7 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index dd12e1e5ce..25213816dd 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -20,6 +20,7 @@ scalable implementation of an AMQP broker.
 
 %define _libdir /usr/lib/erlang
 %define _docdir /usr/share/doc
+%define _mandir /usr/share/man
 %define _maindir $RPM_BUILD_ROOT%{_libdir}/lib/rabbitmq_server-%{main_version}
 %define package_name rabbitmq-server-dist
 
@@ -36,8 +37,10 @@ fi
 %build
 mkdir %{package_name}
 mkdir %{package_name}/sbin
+mkdir %{package_name}/man
 make install TARGET_DIR=`pwd`/%{package_name} \
              SBIN_DIR=`pwd`/%{package_name}/sbin \
+             MAN_DIR=`pwd`/%{package_name}/man
              VERSION=%{main_version}
 
 %install
@@ -45,6 +48,7 @@ mkdir -p %{_maindir}
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/rabbitmq-server
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT%{_mandir}
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/rabbitmq/mnesia
 mkdir -p $RPM_BUILD_ROOT/var/log/rabbitmq
@@ -55,6 +59,7 @@ cp -r %{package_name}/src %{_maindir}
 cp -r %{package_name}/include %{_maindir}
 chmod 755  %{package_name}/sbin/*
 cp %{package_name}/sbin/* $RPM_BUILD_ROOT/usr/sbin/
+cp -r %{package_name}/man/* $RPM_BUILD_ROOT%{_mandir}/
 
 cp ../init.d $RPM_BUILD_ROOT/etc/init.d/rabbitmq-server
 chmod 775 $RPM_BUILD_ROOT/etc/init.d/rabbitmq-server
@@ -63,6 +68,8 @@ mv $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl_rea
 cp ../rabbitmqctl_wrapper $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 
+cp %{buildroot}%{_mandir}/man1/rabbitmqctl.1.gz %{buildroot}%{_mandir}/man1/rabbitmqctl_real.1.gz
+
 %post
 # create rabbitmq group
 if ! getent group rabbitmq >/dev/null; then
@@ -107,10 +114,8 @@ fi
 %defattr(-,root,root)
 %{_libdir}/lib/rabbitmq_server-%{main_version}/
 %{_docdir}/rabbitmq-server/
-/usr/sbin/rabbitmq-server
-/usr/sbin/rabbitmq-multi
-/usr/sbin/rabbitmqctl
-/usr/sbin/rabbitmqctl_real
+%{_mandir}
+/usr/sbin
 /var/lib/rabbitmq
 /var/log/rabbitmq
 /etc/init.d/rabbitmq-server
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 43cb04439a..0b3f55b955 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -1,5 +1,6 @@
 usr/lib/erlang/lib
 usr/sbin
+usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 815deaff51..6edf27c15a 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/makefile.mk
 
 RABBIT_LIB=$(DEB_DESTDIR)usr/lib/erlang/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)
 
-DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB)/ SBIN_DIR=$(DEB_DESTDIR)usr/sbin
+DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB)/ SBIN_DIR=$(DEB_DESTDIR)usr/sbin MAN_DIR=$(DEB_DESTDIR)usr/share/man
 
 DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
 
@@ -14,4 +14,5 @@ install/rabbitmq-server::
 	rm $(RABBIT_LIB)/LICENSE*
 	mv $(DEB_DESTDIR)usr/sbin/rabbitmqctl $(DEB_DESTDIR)usr/sbin/rabbitmqctl_real
 	cp debian/rabbitmqctl_wrapper $(DEB_DESTDIR)usr/sbin/rabbitmqctl
+	cp $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl.1.gz $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl_real.1.gz
 	chmod a+x $(DEB_DESTDIR)usr/sbin/rabbitmqctl
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 132575226c..b398869693 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -7,11 +7,10 @@ dist:
 	make -C ../.. VERSION=$(VERSION) srcdist
 	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
 
-	mkdir $(TARGET_DIR)
-	mkdir $(TARGET_DIR)/sbin
 	make -C $(SOURCE_DIR) \
 		TARGET_DIR=`pwd`/$(TARGET_DIR) \
 		SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \
+		MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
 			install
 
 	tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR)
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 077461c5e0..f9437da7ca 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -15,6 +15,7 @@ dist:
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
 	rm -f $(SOURCE_DIR)/BUILD
+	rm -rf $(SOURCE_DIR)/docs
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)