3 files changed, 29 insertions, 17 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 70d6348..f6eec15 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,14 +1,34 @@
 file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
+list( REMOVE_ITEM _dirs html man )
+
 string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
 
-foreach( _dir ${_dirs} )
-  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
-      EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
-    if( "${_dir}" STREQUAL "en" OR
-        "${_dir}" STREQUAL "man" OR
-        "${_linguas}" MATCHES "^;*$" OR
-        ";${_linguas};" MATCHES ";${_dir};" )
-      add_subdirectory( ${_dir} )
-    endif( )
+foreach( _dir IN LISTS _dirs )
+  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}
+      AND ( "${_dir}" STREQUAL "en" OR
+            "${_linguas}" MATCHES "^;*$" OR
+            ";${_linguas};" MATCHES ";${_dir};" ))
+    file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook )
+    if( _doc_files )
+      list( FIND _doc_files "index.docbook" _find_index )
+      if( -1 EQUAL _find_index )
+        set( _noindex "NOINDEX" )
+      else()
+        unset( _noindex )
+      endif()
+      tde_create_handbook(
+        SOURCE_BASEDIR ${_dir}
+        ${_noindex}
+        LANG ${_dir}
+        DESTINATION ${PROJECT_NAME}
+      )
+    endif()
   endif()
 endforeach()
+
+if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/CMakeLists.txt )
+  add_subdirectory( html )
+endif()
+if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt )
+  add_subdirectory( man )
+endif()
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 57a0b81..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# the SUBDIRS is filled automatically by am_edit. If files are 
-# in this directory they are installed into the english dir
-
-KDE_LANG = en
-KDE_DOCS = basket
-SUBDIRS = $(AUTODIRS)  
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
deleted file mode 100644
index 6a0bb94..0000000
--- a/doc/en/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = basket
-KDE_LANG = en