Index: trunk/FACT++/cmake/FindCCfits.cmake
===================================================================
--- trunk/FACT++/cmake/FindCCfits.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindCCfits.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(CCFITS_INCLUDE_DIR NAMES CCfits/CCfits PATHS ${CCFITS_INCLUDE_DIRS})
+FIND_PATH(CCFITS_INCLUDE_DIR NAMES CCfits PATHS ${CCFITS_INCLUDE_DIRS} PATH_SUFFIXES CCfits)
 FIND_LIBRARY(CCFITS_LIBRARY NAMES CCfits PATHS ${CCFITS_LIBRARY_DIRS})
 
Index: trunk/FACT++/cmake/FindHighlight.cmake
===================================================================
--- trunk/FACT++/cmake/FindHighlight.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindHighlight.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(HIGHLIGHT_INCLUDE_DIR NAMES srchilite/sourcehighlight.h PATHS ${HIGHLIGHT_INCLUDE_DIRS})
+FIND_PATH(HIGHLIGHT_INCLUDE_DIR NAMES sourcehighlight.h PATHS ${HIGHLIGHT_INCLUDE_DIRS} PATH_SUFFIXES srchilite)
 FIND_LIBRARY(HIGHLIGHT_LIBRARY NAMES source-highlight PATHS ${HIGHLIGHT_LIBRARY_DIRS})
 
Index: trunk/FACT++/cmake/FindMySQL++.cmake
===================================================================
--- trunk/FACT++/cmake/FindMySQL++.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindMySQL++.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(MYSQLPP_INCLUDE_DIR NAMES mysql++/mysql++.h PATHS ${MYSQLPP_INCLUDE_DIRS})
+FIND_PATH(MYSQLPP_INCLUDE_DIR NAMES mysql++.h PATHS ${MYSQLPP_INCLUDE_DIRS} PATH_SUFFIXES mysql++)
 FIND_LIBRARY(MYSQLPP_LIBRARY NAMES mysqlpp PATHS ${MYSQLPP_LIBRARY_DIRS})
 
Index: trunk/FACT++/cmake/FindMySQL.cmake
===================================================================
--- trunk/FACT++/cmake/FindMySQL.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindMySQL.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(MYSQL_INCLUDE_DIR NAMES mysql.h PATHS ${MYSQL_INCLUDE_DIRS} /usr/include/mysql)
+FIND_PATH(MYSQL_INCLUDE_DIR NAMES mysql.h PATHS ${MYSQL_INCLUDE_DIRS} PATH_SUFFIXES mysql)
 FIND_LIBRARY(MYSQL_LIBRARY NAMES mysqlclient PATHS ${MYSQL_LIBRARY_DIRS})
 
Index: trunk/FACT++/cmake/FindNova.cmake
===================================================================
--- trunk/FACT++/cmake/FindNova.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindNova.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(NOVA_INCLUDE_DIR NAMES libnova/libnova.h PATHS ${NOVA_INCLUDE_DIRS})
+FIND_PATH(NOVA_INCLUDE_DIR NAMES libnova.h PATHS ${NOVA_INCLUDE_DIRS} PATH_SUFFIXES libnova)
 FIND_LIBRARY(NOVA_LIBRARY NAMES nova PATHS ${NOVA_LIBRARY_DIRS})
 
Index: trunk/FACT++/cmake/FindReadline.cmake
===================================================================
--- trunk/FACT++/cmake/FindReadline.cmake	(revision 19976)
+++ trunk/FACT++/cmake/FindReadline.cmake	(revision 19977)
@@ -4,5 +4,5 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDEDIR})
+FIND_PATH(READLINE_INCLUDE_DIR NAMES readline.h PATHS ${READLINE_INCLUDEDIR} PATH_SUFFIXES readline)
 FIND_LIBRARY(READLINE_LIBRARY NAMES readline PATHS ${READLINE_LIBDIR})