merge trunk revision 2961:

r2961 | asalkeld | 2010-06-21 14:03:36 -0700 (Mon, 21 Jun 2010) | 2 lines

Add make/spec file changes for corosync & blackbox man pages.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2967 fd59a12c-fef9-0310-b244-a6a79926bd2f

corosync.spec.in

@@ -107,6 +107,8 @@ fi
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
 %dir %{_localstatedir}/lib/corosync
 %{_mandir}/man8/corosync_overview.8*
+%{_mandir}/man8/corosync.8*
+%{_mandir}/man8/corosync-blackbox.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man8/corosync-keygen.8*
 %{_mandir}/man8/corosync-cfgtool.8*

man/Makefile.am

@@ -39,7 +39,9 @@ EXTRA_DIST		= index.html
 dist_man_MANS = \
 	corosync.conf.5 \
 	confdb_overview.8 \
+	corosync.8 \
 	corosync-objctl.8 \
+	corosync-blackbox.8 \
 	corosync-keygen.8 \
 	corosync-cfgtool.8 \
 	corosync-cpgtool.8 \