Fix the whole manpage stuff

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1857 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile.am

@@ -36,9 +36,8 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf
 
-MANDIR = /usr/share/man
-SUBDIRS	= include lcr lib exec services tools test pkgconfig
-# man init conf
+SUBDIRS	= include lcr lib exec services tools test pkgconfig man
+# init conf
 
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
@@ -51,12 +50,6 @@ install-exec-local:
 	if [ ! -f $(DESTDIR)${sysconfdir}/corosync.conf ] ; then 	   \
 		$(INSTALL) -m 644 $(srcdir)/conf/corosync.conf $(DESTDIR)${sysconfdir} ; \
 	fi
-	mkdir -p $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL) -m 644 $(srcdir)/man/*.3 $(DESTDIR)$(MANDIR)/man3
-	mkdir -p $(DESTDIR)$(MANDIR)/man5
-	$(INSTALL) -m 644 $(srcdir)/man/*.5 $(DESTDIR)$(MANDIR)/man5
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 644 $(srcdir)/man/*.8 $(DESTDIR)$(MANDIR)/man8
 
 dist-clean-local:
 	rm -f autoconf automake autoheader $(TARFILE)

configure.ac

@@ -87,6 +87,7 @@ AC_CONFIG_FILES([Makefile
                  include/Makefile
                  lcr/Makefile
                  lib/Makefile
+                 man/Makefile
                  pkgconfig/Makefile
                  services/Makefile
                  test/Makefile

man/Makefile

@@ -1,94 +0,0 @@
-# Copyright (c) 2004 MontaVista Software, Inc.
-# 
-# All rights reserved.
-# 
-# This software licensed under BSD license, the text of which follows:
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-# - Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# - Neither the name of the MontaVista Software, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-all: html
-# The index.html file must be hand edited when adding manual pages
-
-html:
-	mkdir html
-	groff -mandoc -Thtml corosync_overview.8 > html/corosync_overview.html
-	groff -mandoc -Thtml corosync.conf.5 > html/corosync.conf.html
-	groff -mandoc -Thtml evs_overview.8 > html/evs_overview.html
-	groff -mandoc -Thtml evs_initialize.3 > html/evs_initialize.html
-	groff -mandoc -Thtml evs_finalize.3 > html/evs_finalize.html
-	groff -mandoc -Thtml evs_fd_get.3 > html/evs_fd_get.html
-	groff -mandoc -Thtml evs_dispatch.3 > html/evs_dispatch.html
-	groff -mandoc -Thtml evs_join.3 > html/evs_join.html
-	groff -mandoc -Thtml evs_leave.3 > html/evs_leave.html
-	groff -mandoc -Thtml evs_mcast_groups.3 > html/evs_mcast_groups.html
-	groff -mandoc -Thtml evs_mcast_joined.3 > html/evs_mcast_joined.html
-	groff -mandoc -Thtml evs_membership_get.3 > html/evs_membership_get.html
-
-	groff -mandoc -Thtml cpg_overview.8 > html/cpg_overview.html
-	groff -mandoc -Thtml cpg_initialize.3 > html/cpg_initialize.html
-	groff -mandoc -Thtml cpg_finalize.3 > html/cpg_finalize.html
-	groff -mandoc -Thtml cpg_fd_get.3 > html/cpg_fd_get.html
-	groff -mandoc -Thtml cpg_dispatch.3 > html/cpg_dispatch.html
-	groff -mandoc -Thtml cpg_join.3 > html/cpg_join.html
-	groff -mandoc -Thtml cpg_leave.3 > html/cpg_leave.html
-	groff -mandoc -Thtml cpg_mcast_joined.3 > html/cpg_mcast_joined.html
-	groff -mandoc -Thtml cpg_membership_get.3 > html/cpg_membership_get.html
-	groff -mandoc -Thtml cpg_context_get.3 > html/cpg_context_get.html
-	groff -mandoc -Thtml cpg_context_set.3 > html/cpg_context_set.html
-	groff -mandoc -Thtml cpg_local_get.3 > html/cpg_local_get.html
-
-	groff -mandoc -Thtml confdb_dispatch.3> html/confdb_dispatch.html
-	groff -mandoc -Thtml confdb_fd_get.3 > html/confdb_fd_get.html
-	groff -mandoc -Thtml confdb_finalize.3 > html/confdb_finalize.html
-	groff -mandoc -Thtml confdb_initialize.3 > html/confdb_initialize.html
-	groff -mandoc -Thtml confdb_key_create.3 > html/confdb_key_create.html
-	groff -mandoc -Thtml confdb_key_delete.3 > html/confdb_key_delete.html
-	groff -mandoc -Thtml confdb_key_iter.3 > html/confdb_key_iter.html
-	groff -mandoc -Thtml confdb_key_replace.3 > html/confdb_key_replace.html
-	groff -mandoc -Thtml confdb_object_create.3 > html/confdb_object_create.html
-	groff -mandoc -Thtml confdb_object_destroy.3 > html/confdb_object_destroy.html
-	groff -mandoc -Thtml confdb_object_find.3 > html/confdb_object_find.html
-	groff -mandoc -Thtml confdb_object_iter.3 > html/confdb_object_iter.html
-	groff -mandoc -Thtml confdb_object_parent_get.3 > html/confdb_object_parent_get.html
-	groff -mandoc -Thtml confdb_overview.8 > html/confdb_overview.html
-
-	groff -mandoc -Thtml votequorum_overview.8 > html/votequorum_overview.html
-	groff -mandoc -Thtml votequorum_initialize.3 > html/votequorum_initialize.html
-	groff -mandoc -Thtml votequorum_finalize.3 > html/votequorum_finalize.html
-	groff -mandoc -Thtml votequorum_fd_get.3 > html/votequorum_fd_get.html
-	groff -mandoc -Thtml votequorum_dispatch.3 > html/votequorum_dispatch.html
-	groff -mandoc -Thtml votequorum_getinfo.3 > html/votequorum_getinfo.html
-	groff -mandoc -Thtml votequorum_leaving.3 > html/votequorum_leaving.html
-	groff -mandoc -Thtml votequorum_setexpected.3 > html/votequorum_setexpected.html
-	groff -mandoc -Thtml votequorum_setvotes.3 > html/votequorum_setvotes.html
-	groff -mandoc -Thtml votequorum_qdisk_register.3 > html/votequorum_qdisk_register.html
-	groff -mandoc -Thtml votequorum_qdisk_unregister.3 > html/votequorum_qdisk_unregister.html
-	groff -mandoc -Thtml votequorum_qdisk_poll.3 > html/votequorum_poll.html
-	groff -mandoc -Thtml votequorum_qdisk_getinfo.3 > html/votequorum_qdisk_getinfo.html
-	cp index.html html
-
-clean:
-	rm -rf html
-

man/Makefile.am

@@ -0,0 +1,106 @@
+# Copyright (c) 2004 MontaVista Software, Inc.
+# Copyright (c) 2009 Red Hat, Inc.
+#
+# Authors: Steven Dake (sdake@redhat.com)
+#          Fabio M. Di Nitto (fdinitto@redhat.com)
+# 
+# All rights reserved.
+# 
+# This software licensed under BSD license, the text of which follows:
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# - Neither the name of the MontaVista Software, Inc. nor the names of its
+#   contributors may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+dist_man_MANS = \
+	corosync.conf.5 \
+	confdb_overview.8 \
+	corosync-objctl.8 \
+	corosync_overview.8 \
+	cpg_overview.8 \
+	evs_overview.8 \
+	logsys_overview.8 \
+	votequorum_overview.8 \
+	confdb_dispatch.3 \
+	confdb_fd_get.3 \
+	confdb_finalize.3 \
+	confdb_initialize.3 \
+	confdb_key_create.3 \
+	confdb_key_delete.3 \
+	confdb_key_iter.3 \
+	confdb_key_replace.3 \
+	confdb_object_create.3 \
+	confdb_object_destroy.3 \
+	confdb_object_find.3 \
+	confdb_object_iter.3 \
+	confdb_object_parent_get.3 \
+	cpg_context_get.3 \
+	cpg_context_set.3 \
+	cpg_dispatch.3 \
+	cpg_fd_get.3 \
+	cpg_finalize.3 \
+	cpg_initialize.3 \
+	cpg_join.3 \
+	cpg_leave.3 \
+	cpg_local_get.3 \
+	cpg_mcast_joined.3 \
+	cpg_membership_get.3 \
+	evs_dispatch.3 \
+	evs_fd_get.3 \
+	evs_finalize.3 \
+	evs_initialize.3 \
+	evs_join.3 \
+	evs_leave.3 \
+	evs_mcast_groups.3 \
+	evs_mcast_joined.3 \
+	evs_membership_get.3 \
+	votequorum_dispatch.3 \
+	votequorum_fd_get.3 \
+	votequorum_finalize.3 \
+	votequorum_getinfo.3 \
+	votequorum_initialize.3 \
+	votequorum_leaving.3 \
+	votequorum_qdisk_getinfo.3 \
+	votequorum_qdisk_poll.3 \
+	votequorum_qdisk_register.3 \
+	votequorum_qdisk_unregister.3 \
+	votequorum_setexpected.3 \
+	votequorum_setvotes.3
+
+if BUILD_HTML_DOCS
+
+HTML_DOCS = $(dist_man_MANS:%=%.html)
+
+doc_DATA = *.html
+
+%.html: %
+	$(GROFF) -mandoc -Thtml $^ > $@
+
+all-local: $(HTML_DOCS)
+
+clean-local:
+	rm -rf $(HTML_DOCS)
+
+endif