X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Flib%2Fdoxygen.sh;h=19d65601f82cf487c6d89bba54f07bd75d4bdbf2;hb=5d7f7add811bc8fa87b91653811583f9593aeea2;hp=dd726092963766d3c1249a1882742ee37cd06c17;hpb=a5d6a20ef608461a1932b4983139e8a3c1facada;p=senf.git

diff --git a/site_scons/lib/doxygen.sh b/site_scons/lib/doxygen.sh
index dd72609..19d6560 100755
--- a/site_scons/lib/doxygen.sh
+++ b/site_scons/lib/doxygen.sh
@@ -5,6 +5,7 @@ do_html_cleanup()
     sed -e 's/id="current"/class="current"/' \
 	| tidy -ascii -q --wrap 0 --show-warnings no --fix-uri no \
 	| sed -e 's/name="\([^"]*\)"\([^>]*\) id="\1"/name="\1"\2/g' \
+              -e 's/id="\([^"]*\)"\([^>]*\) name="\1"/name="\1"\2/g' \
 	| xsltproc --novalid --nonet --html --stringparam topdir "$reltopdir" \
 	      "$base/html-munge.xsl" -
 }
@@ -139,13 +140,16 @@ doxydir="`abspath "$doxydir"`" #`"
 
 ## Find $TOPDIR
 
-cd "$doxydir"
-while [ ! -r "SConstruct" -a "`pwd`" != "/" ]; do cd ..; done
-if [ ! -r "SConstruct" ]; then
-    echo "topdir not found"
-    exit 1;
+if [ -z "$TOPDIR" ]; then
+    cd "$doxydir"
+    while [ ! -r "SConstruct" -a "`pwd`" != "/" ]; do cd ..; done
+    if [ ! -r "SConstruct" ]; then
+	echo "topdir not found"
+	exit 1;
+    fi
+    TOPDIR="`pwd`";
 fi
-TOPDIR="`pwd`";
+
 reltopdir="`relpath "$doxydir/$output_dir/$html_dir" "$TOPDIR"`" #`"
 cd "$doxydir"
 
@@ -162,6 +166,15 @@ if [ -n "$tagfile_name" ]; then
     done
 fi
 
+## Remove empty tagfiles from list of tagfiles
+
+x="$tagfiles"; tagfiles=""
+for f in $x; do
+    if [ -s "$f" ]; then
+	tagfiles="$tagfiles${tagfiles:+ }$f"
+    fi
+done
+
 ## Call doxygen proper
 
 generate_tagfile=""
@@ -170,6 +183,7 @@ if [ "$tagfile" = "YES" ]; then
 fi
 export TOPDIR LIBDIR html tagfile tagfile_name tagfiles output_dir html_dir generate_tagfile
 
+echo "+ cd $doxydir"
 cmd ${DOXYGEN:-doxygen}