[Olena-patches] olena-2.0-61-g99ee8de Fix Milena doc (un)installation.

* doc/Doxyfile.in: Fix paths. * doc/Makefile.am: Fix install/uninstall rules. --- milena/ChangeLog | 8 ++++++++ milena/doc/Doxyfile.in | 4 ++-- milena/doc/Makefile.am | 10 +++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2454245..ae7964a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2012-02-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Milena doc (un)installation. + + * doc/Doxyfile.in: Fix paths. + + * doc/Makefile.am: Fix install/uninstall rules. + 2011-11-30 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/accu/math/sumpow.hh: New accumulator. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 494d99c..7790ce6 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -122,7 +122,7 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 - +CITE_BIB_FILES = @top_srcdir@/doc/doc.bib #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -149,7 +149,7 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = @top_srcdir@/doc/header.html HTML_FOOTER = @top_srcdir@/doc/subdoc_footer.html HTML_STYLESHEET = @top_srcdir@/doc/doxygen.css -LAYOUT_FILE = @top_srcdir@/doc/DoxygenLayout.xml +LAYOUT_FILE = @top_srcdir@/milena/doc/DoxygenLayout.xml HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 2132c7e..99dd4c6 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -739,11 +739,11 @@ DATA_html_dirs_inst = $(WHITE_PAPER) # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir) + $(mkdir_p) $(DESTDIR)$(htmldir)/$(USER_REFMAN) # The user reference manual is located in a subdirectory, hence this # special case. - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) - cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena + cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/$$d; \ @@ -762,5 +762,5 @@ uninstall-local: done # Same remark as above regarding the special case of the user # reference manual. - chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN) - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) + chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena -- 1.7.2.5