From d3c9d7f3b5185b1aca35b651cd6ac597f22f3311 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 4 Jun 2020 11:33:56 +1000
Subject: Fix building doxygen with RTEMS 5

Closes #3995
---
 rtems-release-docs   |  2 +-
 rtems-release-kernel | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/rtems-release-docs b/rtems-release-docs
index 58efcfc..7125067 100755
--- a/rtems-release-docs
+++ b/rtems-release-docs
@@ -171,7 +171,7 @@ cd ${release}/${docs}
  #
  # If doxygen information has been generate move it into the docs.
  #
- for p in ../rtems-${release}-doxygen.tar.${comp_ext}
+ for p in ../rtems-${release}-doxygen-html.tar.${comp_ext}
  do
   if [ -e ${p} ]; then
     mv ${p} .
diff --git a/rtems-release-kernel b/rtems-release-kernel
index f182996..16864d2 100755
--- a/rtems-release-kernel
+++ b/rtems-release-kernel
@@ -141,22 +141,34 @@ fi
 echo "Creating: Doxyfile"
 top_srcdir=$(echo ${prefix}/cpukit | sed -e 's/\//\\\//g')
 perl=$(which perl | sed -e 's/\//\\\//g')
-cat ${prefix}/cpukit/Doxyfile.in | \
-    sed -e "s/@PACKAGE_VERSION@/${release}/g" \
-	-e "s/@top_srcdir@/${top_srcdir}/g" \
-	-e "s/@PERL@/${perl}/g" \
-	-e "s/^INPUT[[:space:]].*=.*$/INPUT = ${top_srcdir}/g" \
-	-e "s/^HAVE_DOT[[:blank:]]/DOT_NUM_THREADS = 1\\
+if [ -f ${prefix}/cpukit/Doxyfile.in ]; then
+ cat ${prefix}/cpukit/Doxyfile.in | \
+  sed -e "s/@PACKAGE_VERSION@/${release}/g" \
+      -e "s/@top_srcdir@/${top_srcdir}/g" \
+      -e "s/@PERL@/${perl}/g" \
+      -e "s/^INPUT[[:space:]].*=.*$/INPUT = ${top_srcdir}/g" \
+      -e "s/^HAVE_DOT[[:blank:]]/DOT_NUM_THREADS = 1\\
 HAVE_DOT /g"> Doxyfile
-doxygen Doxyfile
+ doxygen Doxyfile
+elif [ ${prefix}/Doxygen ]; then
+ cat ${prefix}/Doxyfile | \
+  sed -e "s/^PROJECT_NUMBER[[:space:]].*=.*$/PROJECT_NUMBER = ${release}/g" \
+  > Doxyfile
+ cd ${prefix}
+  doxygen ../Doxyfile
+  cd ..
+else
+ echo "error: no doxygen configuration file found"
+ exit 1
+fi
 
 echo "Creating: rtems-doxygen-${release}.tar.${comp_ext}"
 if [ ${version} -lt 5 ]; then
  mv cpukit_doxy/html rtems-doxygen-${release}
 else
- mv html rtems-doxygen-${release}
+ cp -r ${prefix}/doc/html rtems-doxygen-${release}
 fi
 tar cf - rtems-doxygen-${release} | \
-    ${comp} > ../rtems-${release}-doxygen.tar.${comp_ext}
+    ${comp} > ../rtems-${release}-doxygen-html.tar.${comp_ext}
 
 exit 0
-- 
cgit v1.2.3