[Olena-patches] olena-2.0-475-g87a4a34 Use relative paths in documentation.

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- milena/ChangeLog | 7 +++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 11 ++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f39b9d7..fea31b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use relative paths in documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2013-04-11 Guillaume Lazzara <z(a)lrde.epita.fr> Reference value types documentation in Values group. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5727c5d..9d1101b 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = "Milena" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "@PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index c79945b..b25f240 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -254,7 +254,7 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. @@ -762,14 +762,14 @@ 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)/milena/$(USER_REFMAN) + $(mkdir_p) $(DESTDIR)$(htmldir)/milena/ # The user reference manual is located in a subdirectory, hence this # special case. rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - sed -i -e "s,\$(top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ @@ -792,3 +792,8 @@ uninstall-local: chmod -R 700 $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/milena + + +doc-teamcity: + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(top_srcdir)/milena/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5