* doc/Makefile.am, * doc/Doxyfile.in: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 33 ++++++++++++++++++--------------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e8364b3..f8ef215 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2012-02-28 Guillaume Lazzara <z@lrde.epita.fr> + + Disable the use of installdox and fix doc location. + + * doc/Makefile.am, + * doc/Doxyfile.in: Here. + 2012-02-27 Guillaume Lazzara <z@lrde.epita.fr> * src/debug/show_lines_boldness.cc: Use mln::math::round as a diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index eb103cd..dd1bf26 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -332,7 +332,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../../milena/doc/milena.tag=../../../../milena/doc/user-refman/html +TAGFILES = @builddir@/../../milena/doc/milena.tag=../../../milena/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 1c4e081..db72cdd 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -97,6 +97,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) ## Check some files before deeming the output as acceptable. 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\@,../../../user-refman/html/,g" \ + $(USER_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -176,6 +179,9 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) ## Check some files before deeming the output as acceptable. 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\@,../,g" \ + $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @mv -f $@.tmp $@ @@ -221,33 +227,30 @@ maintainer-clean-local: # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir)/$(USER_REFMAN) + $(mkdir_p) $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) # The user reference manual is located in a subdirectory, hence this # special case. - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo + rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html \ - $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo -# Update paths to milena documentation directory - $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo/installdox \ - -l milena.tag@$(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo/ -name '*.html'` + $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ - rm -rf $(DESTDIR)$(htmldir)/$$d; \ - cp -r $(srcdir)/$$d $(DESTDIR)$(htmldir); \ + rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ + cp -r $(srcdir)/$$d $(DESTDIR)$(htmldir)/scribo;\ done ## Try GNU chmod's X mode before resorting to something slower but ## more standard. - chmod -R a+rX $(DESTDIR)$(htmldir) || \ - find $(DESTDIR)$(htmldir) \( -type d -a -exec chmod a+rx {} \; \) \ + chmod -R a+rX $(DESTDIR)$(htmldir)/scribo || \ + find $(DESTDIR)$(htmldir)/scribo \( -type d -a -exec chmod a+rx {} \; \) \ -o -exec chmod a+r {} \; uninstall-local: for d in $(DATA_html_dirs_inst); do \ - chmod -R 700 $(DESTDIR)$(htmldir)/$$d; \ - rm -rf $(DESTDIR)$(htmldir)/$$d; \ + chmod -Rf 700 $(DESTDIR)$(htmldir)/scribo/$$d; \ + rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ done # Same remark as above regarding the special case of the user # reference manual. - chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo + chmod -Rf 700 $(DESTDIR)$(htmldir)/scribo/ + rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) + rm -rf $(DESTDIR)$(htmldir)/scribo -- 1.7.2.5