* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a31ff19..dea2689 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix path to other documentations. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2013-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/primitive/extract/Makefile.am: Add more files in diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index bc0f2c7..b28bd55 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=../../../milena/user-refman/html +TAGFILES = @builddir@/../../milena/doc/milena.tag=@top_srcdir@/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 9cbe355..38f2d1d 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -98,7 +98,8 @@ $(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\@,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @@ -180,7 +181,7 @@ $(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\@,$(DESTDIR)$(htmldir)/$(DEVEL_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -233,6 +234,10 @@ install-data-local: rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html \ $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) +## Fix path to the main page of the documentation. + 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" \ + `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ -- 1.7.2.5