* doc/Makefile.am, * doc/header.html, * doc/mainpage.dox: Here. --- ChangeLog | 8 ++++++++ doc/Makefile.am | 9 ++++++++- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 806acdb..7b1004e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-04-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix path to other documentations. + + * doc/Makefile.am, + * doc/header.html, + * doc/mainpage.dox: Here. + 2013-03-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * doc/Makefile.am: Add a missing dependency. diff --git a/doc/Makefile.am b/doc/Makefile.am index 36a14aa..c328b77 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,7 +121,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,,g" $(USER_REFMAN).tmp/html/index.html + sed -i -e "s,\@relcommondocpath\@,$(abs_top_srcdir)/,g" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -208,6 +210,11 @@ install-data-local: # # rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) +# Fix documentation paths + sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ + -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ + -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ diff --git a/doc/header.html b/doc/header.html index 0d1b1cc..7e9e03a 100644 --- a/doc/header.html +++ b/doc/header.html @@ -25,7 +25,7 @@ $extrastylesheet <tbody> <tr style="height: 56px;"> <!--BEGIN PROJECT_LOGO--> - <td id="projectlogo"><a href="@relcommondocpath@$relpath$index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> + <td id="projectlogo"><a href="@relcommondocpath@doc/@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> <!--END PROJECT_LOGO--> <!--BEGIN PROJECT_NAME--> <td style="padding-left: 0.5em;"> diff --git a/doc/mainpage.dox b/doc/mainpage.dox index e293b4c..65e5177 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -19,8 +19,8 @@ </td> <td> \li \ref moduleslist - \li <a class="el" href="../../milena/user-refman/html/index.html">Milena</a> - \li <a class="el" href="../../scribo/user-refman/html/index.html">Scribo</a> + \li <a class="el" href="@relcommondocpath@milena/doc/user-refman/html/index.html">Milena</a> + \li <a class="el" href="@relcommondocpath@scribo/doc/user-refman/html/index.html">Scribo</a> \li Swilena </td> <td> -- 1.7.2.5