* doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... (EXTRA_DIST): ...here. (install-data-local, uninstall-local): New rules. Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>fr>. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 27 ++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 223d1d8..527b08f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Fix the installation of the Doxygen HTML user documentation. + + * doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... + (EXTRA_DIST): ...here. + (install-data-local, uninstall-local): New rules. + Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>fr>. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Build the reference documentation in the source dir. * doc/Makefile.am (USER_REFMAN_PDF): Set to user-refman.pdf. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index a7d4647..1580c1f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -238,9 +238,30 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk -dist_doc_DATA = \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) +dist_doc_DATA = $(USER_REFMAN_PDF) + +# Installing a directory located in the source dir is not supported by +# Automake by default, so we cannot add `USER_REFMAN_HTML' to +# `dist_doc_DATA'. The following two rules are are workaround from +# the Vaucanson project. +EXTRA_DIST += $(USER_REFMAN_HTML) + +# We install by hand, otherwise Automake produces "install .../srcdoc +# .../srcdoc", which installs our dir into the previous one, instead +# of replacing it. +install-data-local: + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + $(mkdir_p) $(DESTDIR)$(htmldir) + cp -r $(srcdir)/$(USER_REFMAN_HTML) $(DESTDIR)$(htmldir) +## Try GNU chmod's X mode before resorting to something slower but +## more standard. + chmod -R a+rX $(DESTDIR)$(htmldir) || \ + find $(DESTDIR)$(htmldir) \( -type d -a -exec chmod a+rx {} \; \) \ + -o -exec chmod a+r {} \; + +uninstall-local: + chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) EXTRA_DIST += \ -- 1.6.1.2