Make doc installation work and simplify doc/Makefile.am.

Don't override the default htmldir with an unquoted copy.

Don't suppress `make` echoing on Doxygen commands.

Ensure the tutorial is always installed even if Doxygen isn't
available.

Take better advantage of the automake installation infrastructure.

diff --git a/acinclude.m4 b/acinclude.m4
index 27fda42..186873c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -99,10 +99,6 @@ AC_DEFUN([AM_CHECK_DOXYGEN],
     dnl Substitution
     dnl
     AC_SUBST([DOXYGEN])
-    dnl according to the autoconf doc, htmldir == docdir == ${prefix}/share/doc/${PACKAGE_NAME}
-    dnl I tried to use docdir, without success
-    htmldir=${prefix}/share/doc/${PACKAGE_NAME}
-    AC_SUBST(htmldir)
     AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")
    ])
 dnl End of acinclude.m4

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4b0ec90..f46f0b1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,38 +3,29 @@ EXTRA_DIST = \
 tutorial/index.html \
 tutorial/xcb.css
 
-if BUILD_DOCS
+htmlDATA_INSTALL = cp -pR
 
-# install documentation
+html_DATA = tutorial/
 
-all-local: doc-build.stamp
+uninstall-htmlDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(html_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+         rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+       done
+       rmdir "$(DESTDIR)$(htmldir)/" || true
 
-# rule to remove all old created files
-doc-prepare.stamp:
-       @if test -d manual/ ; then \
-         rm -rf manual/; \
-       fi
+if BUILD_DOCS
 
 # rule to build documentation and copy necessary files
-doc-build.stamp: doc-prepare.stamp
-       @cd .. && doxygen xcb.doxygen
+manual: clean-local
+       cd .. && doxygen xcb.doxygen
 
 # rules to clean
 clean-local:
-       @rm -rf manual/
-
-install-data-local: install-html-local
-
-# rule to install the html documentation and tutorial in $(htmldir)
-install-html-local:
-       @if ! test -d "$(DESTDIR)$(htmldir)"; then \
-         $(mkinstalldirs) "$(DESTDIR)$(htmldir)"; \
-       fi
-       @cp -pr manual/ "$(DESTDIR)$(htmldir)"
-       @cp -pr tutorial/ "$(DESTDIR)$(htmldir)"
+       rm -rf manual/
 
-# rule to uninstall the documentation
-uninstall-local:
-       @rm -rf $(DESTDIR)$(htmldir)
+html_DATA += manual/
 
 endif