Bugfixes

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26596 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt
index 3c7f9bfaffa19489e528419daa2be985ae92dbe2..65681fdabfaa98c82676ad64ff29debcbba46bcc 100644 (file)
--- a/deal.II/doc/CMakeLists.txt
+++ b/deal.II/doc/CMakeLists.txt
@@ -15,23 +15,10 @@ IF(DEAL_II_WITH_DOXYGEN)
   # Install the homepage:
   #
 
-  IF(DEAL_II_INSTALL_COMPAT_FILES)
-    #
-    # The good, old directory where the documentation gets installed to:
-    #
-    SET(DEAL_II_DOCUMENTATION_RELDIR "doc")
-  ELSE()
-    #
-    # IF DEAL_II_INSTALL_COMPAT_FILES is not set, we assume that we have to
-    # obey the file system standard, so install to usr/share/doc/deal.II.
-    #
-    SET(DEAL_II_DOCUMENTATION_RELDIR "usr/share/doc/deal.II/html")
-  ENDIF()
-
   INSTALL(DIRECTORY .
     DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}
     COMPONENT documentation
-    FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$"  # TODO! cmapx, dot
+    FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$"  # TODO
     )
 
   CONFIGURE_FILE(

diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt
index 1c423725a2fd5fdd0acf7de9796304f5ad77571d..6512ff68da136f307db9855232e98a54dac9411c 100644 (file)
--- a/deal.II/doc/doxygen/CMakeLists.txt
+++ b/deal.II/doc/doxygen/CMakeLists.txt
@@ -71,9 +71,10 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all?
   DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/deal.II
     ${CMAKE_CURRENT_BINARY_DIR}/options.dox
-    ${CMAKE_CURRENT_BINARY_DIR}/header.html
-    ${CMAKE_CURRENT_BINARY_DIR}/footer.html
-    ${CMAKE_CURRENT_BINARY_DIR}/filter
+    #already generated at configuration time:
+    #${CMAKE_CURRENT_BINARY_DIR}/header.html
+    #${CMAKE_CURRENT_BINARY_DIR}/footer.html
+    #${CMAKE_CURRENT_BINARY_DIR}/filter
     #${CMAKE_BINARY_DIR}/include/deal.II/base/config.h
     #${CMAKE_BINARY_DIR}/include/deal.II/lac/lapack_templates.h
   COMMENT "Generating documentation via doxygen"