--- a/build/mkcmake.sh	Mon Dec 15 15:30:48 2008 +0000
+++ b/build/mkcmake.sh	Mon Dec 15 15:36:17 2008 +0000
@@ -1,21 +1,33 @@
 #!/bin/sh
 
+# build mode defaults to Release
 if [ -z "$1" ]; then
     BUILD_TYPE=Release
 else
     BUILD_TYPE="$1"
 fi
 
+# install prefix defaults to /tmp
 if [ -z "$2" ]; then
     INSTALL_PREFIX=/tmp
 else
     INSTALL_PREFIX="$2"
 fi
 
-echo "-- Using BUILD_TYPE=${BUILD_TYPE}, INSTALL_PREFIX=${INSTALL_PREFIX}"
+# detect doxygen from HUT /p/contrib
+if [ -x /p/contrib/bin/doxygen ]; then
+    echo "Detected doxygen in /p/contrib/bin/"
 
-cmake ../                                       \
-    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}            \
-    -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX      \
-    -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wconversion"
+    DOXYGEN_HOME=/p/contrib/bin
+fi
 
+# output parameters
+echo "*** Using BUILD_TYPE=${BUILD_TYPE}, INSTALL_PREFIX=${INSTALL_PREFIX}, DOXYGEN_HOME=${DOXYGEN_HOME}"
+
+# run cmake
+cmake ../                                           \
+    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX          \
+    -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wconversion"  \
+    -DDOXYGEN_HOME=${DOXYGEN_HOME}
+

--- a/cmake/Modules/FindDoxygen.cmake	Mon Dec 15 15:30:48 2008 +0000
+++ b/cmake/Modules/FindDoxygen.cmake	Mon Dec 15 15:36:17 2008 +0000
@@ -42,10 +42,14 @@
 
 IF (DOXYGEN_EXECUTABLE)
     SET (DOXYGEN_FOUND TRUE)
+
+    MESSAGE (STATUS "Found Doxygen at ${DOXYGEN_EXECUTABLE}")
 ENDIF (DOXYGEN_EXECUTABLE)
 
 IF (DOXYGEN_DOT_EXECUTABLE)
     SET (DOXYGEN_DOT_FOUND TRUE)  
+    
+    MESSAGE (STATUS "Found Dot at ${DOXYGEN_DOT_EXECUTABLE}")
 
     # the directory of dot is required in doxygen.config: DOT_PATH
     GET_FILENAME_COMPONENT (DOXYGEN_DOT_EXECUTABLE_PATH ${DOXYGEN_DOT_EXECUTABLE} PATH)

--- a/doc/CMakeLists.txt	Mon Dec 15 15:30:48 2008 +0000
+++ b/doc/CMakeLists.txt	Mon Dec 15 15:36:17 2008 +0000
@@ -9,7 +9,7 @@
 
 IF (DOXYGEN_FOUND)
     # doxygen.conf.in -> doxygen.conf
-    MESSAGE (STATUS "configure ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf.in --> ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf")
+    MESSAGE (STATUS "Doxygen: configure ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf.in --> ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf")
 
     CONFIGURE_FILE (
         ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf.in
@@ -26,7 +26,7 @@
         ${DOXYGEN_EXECUTABLE} ${DOXYGEN_CONFIG}
     )
     
-    MESSAGE (STATUS "doxygen output will be installed in ${PROJECT_DOXYGEN_DIR}")
+    MESSAGE (STATUS "Doxygen: output will be installed in ${PROJECT_DOXYGEN_DIR}")
 
 ENDIF (DOXYGEN_FOUND)
 

--- a/doc/mkdoxyconf.sh	Mon Dec 15 15:30:48 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-/p/contrib/bin/doxygen doxygen.conf