From: bangerth Date: Sun, 27 Jun 2010 18:03:38 +0000 (+0000) Subject: Take over patches 21383 through 21385 from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=913359f3cf913b12aecf238c06abb46a6364501d;p=dealii-svn.git Take over patches 21383 through 21385 from mainline. git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21386 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/doxygen/Makefile.in b/deal.II/doc/doxygen/Makefile.in index 9572155231..db7eedae60 100644 --- a/deal.II/doc/doxygen/Makefile.in +++ b/deal.II/doc/doxygen/Makefile.in @@ -17,9 +17,20 @@ private: perl -pi -e 's/(EXTRACT_PRIVATE\s*=\s*)NO/$$1YES/;s/(INTERNAL_DOCS\s*=\s*)NO/$$1YES/;' options.dox $(MAKE) html -# generate documentation. write the output to a file so as not to hide the +# Generate documentation. write the output to a file so as not to hide the # important message to impatient observers that this process can take quite # a while +# +# We have to fix up one case after doxygen runs: doxygen versions +# 1.6.2 and 1.6.3 (and only these versions) create output files for +# @page commands that contain underscores where the underscore is +# escaped by a second underscore (e.g. "step__1.html" instead of +# "step_1.html"). While all internal links from the doxygen output are +# correct, the links we have from the handwritten html files won't +# work any more this way. The simplest way to avoid this is to simply +# copy all such files to their alternative (traditional) name so that +# the external links still work (they will link to a different but +# equal file). deal.II deal.tag: tutorial \ deal.dox \ $D/base/include/*/*.h \ @@ -30,6 +41,12 @@ deal.II deal.tag: tutorial \ @echo "=== Generating reference documentation. " \ "This can take several minutes..." cat @DOXYGEN_OPTIONS@ deal.dox | @DOXYGEN@ - > doxygen.log + @if test -f deal.II/step__1.html ; then \ + for i in deal.II/*__*html ; do \ + j="`echo $$i | sed s/__/_/g`" ; \ + cp $$i $$j ; \ + done ; \ + fi @cp deal.css deal.II