[Olena-patches] olena-2.0-474-gac8d6ba Use relative paths in documentation.

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 17 ++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3e1afbe..d6dc2aa 100644 --- a/scribo/ChangeLog +++ b/scribo/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-10 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix permissions on documentation files. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index b28bd55..28371aa 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -334,7 +334,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../../milena/doc/milena.tag=@top_srcdir@/milena/doc/user-refman/html +TAGFILES = @builddir@/../../milena/doc/milena.tag=../../../../milena/doc/user-refman/html GENERATE_TAGFILE = scribo.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = NO diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index ca773e6..d1a5f44 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,7 +99,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. @@ -182,7 +182,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ + -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -229,7 +230,7 @@ maintainer-clean-local: # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) + $(mkdir_p) $(DESTDIR)$(htmldir)/scribo/ # The user reference manual is located in a subdirectory, hence this # special case. rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN)/html @@ -237,8 +238,8 @@ install-data-local: $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) - sed -i -e "s,$(top_srcdir)/doc/$(USER_REFMAN)/html/,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/,g" \ - -e "s,$(top_srcdir)/milena/doc,$(DESTDIR)$(htmldir)/milena/$(USER_REFMAN),g" \ + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ @@ -261,3 +262,9 @@ uninstall-local: chmod -Rf 700 $(DESTDIR)$(htmldir)/scribo/ rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/scribo + + +doc-teamcity: + sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc/,g" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(top_srcdir)/scribo/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5