Browse Source

Fix doc stuff

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1860 fd59a12c-fef9-0310-b244-a6a79926bd2f
Fabio M. Di Nitto 17 years ago
parent
commit
17658c56e6
3 changed files with 9 additions and 3 deletions
  1. 4 1
      Makefile.am
  2. 1 0
      configure.ac
  3. 4 2
      man/Makefile.am

+ 4 - 1
Makefile.am

@@ -36,6 +36,9 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf
 
+dist_doc_DATA		= LICENSE QUICKSTART README.devmap \
+			  README.recovery SECURITY TODO
+
 SUBDIRS	= include lcr lib exec services tools test pkgconfig man
 # init conf
 
@@ -45,7 +48,7 @@ lint:
 doxygen:
 	mkdir -p doc/api && doxygen
 
-install-exec-local:
+install-data-local:
 	$(INSTALL) -d $(DESTDIR)${sysconfdir}
 	if [ ! -f $(DESTDIR)${sysconfdir}/corosync.conf ] ; then 	   \
 		$(INSTALL) -m 644 $(srcdir)/conf/corosync.conf $(DESTDIR)${sysconfdir} ; \

+ 1 - 0
configure.ac

@@ -312,6 +312,7 @@ AC_MSG_RESULT([  Version                  = ${VERSION}])
 AC_MSG_RESULT([  Prefix                   = ${prefix}])
 AC_MSG_RESULT([  Executables              = ${sbindir}])
 AC_MSG_RESULT([  Man pages                = ${mandir}])
+AC_MSG_RESULT([  Doc dir                  = ${docdir}])
 AC_MSG_RESULT([  Libraries                = ${libdir}])
 AC_MSG_RESULT([  Header files             = ${includedir}])
 AC_MSG_RESULT([  Arch-independent files   = ${datadir}])

+ 4 - 2
man/Makefile.am

@@ -93,11 +93,13 @@ if BUILD_HTML_DOCS
 
 HTML_DOCS = $(dist_man_MANS:%=%.html)
 
-doc_DATA = *.html
-
 %.html: %
 	$(GROFF) -mandoc -Thtml $^ > $@
 
+install-data-local:
+	install -d $(DESTDIR)/${docdir}/html
+	install -m644 *.html $(DESTDIR)/${docdir}/html/
+
 all-local: $(HTML_DOCS)
 
 clean-local: