[Olena-patches] olena-2.0-85-g2240957 Fix documentation.

* doc/Doxyfile.in, * doc/Makefile.am: Fix path to data and fix cleanup. --- ChangeLog | 7 +++++++ doc/Doxyfile.in | 3 ++- doc/Makefile.am | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 271da13..5297ebb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am: Fix path to data and fix cleanup. + 2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Add more missing files in EXTRA_DIST. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 51b712a..e922c9a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -101,6 +101,7 @@ EXCLUDE_PATTERNS = *spe.hh EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::* EXAMPLE_PATH = @top_srcdir@/doc/ \ @builddir@ \ + @top_builddir@/doc \ @top_srcdir@ EXAMPLE_PATTERNS = *.cc \ *.cc.raw \ @@ -111,7 +112,7 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 -CITE_BIB_FILES = @top_srcdir@/doc/olena.bib +CITE_BIB_FILES = @abs_top_srcdir@/doc/olena.bib #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- diff --git a/doc/Makefile.am b/doc/Makefile.am index 1b5835a..2feb4e0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -94,6 +94,7 @@ edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' \ + -e 's,@abs_top_srcdir\@,$(abs_top_srcdir),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@srcdir\@,$(srcdir),g' \ -e 's,@builddir\@,$(builddir),g' @@ -197,7 +198,11 @@ install-data-local: $(mkdir_p) $(DESTDIR)$(htmldir) # The user reference manual is located in a subdirectory, hence this # special case. - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) + +#FIXME: Find a way to clear old files without removing freshly +#installed module docs. +# +# rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Update paths to milena documentation directory $(DESTDIR)$(htmldir)/$(USER_REFMAN)/installdox \ -- 1.7.2.5