diff --git a/cmake/craft_CMakeLists.txt.in b/cmake/craft_CMakeLists.txt.in
index 199881b293..3a951c1c99 100644
--- a/cmake/craft_CMakeLists.txt.in
+++ b/cmake/craft_CMakeLists.txt.in
@@ -6,7 +6,8 @@ ExternalProject_Add(craft
         SOURCE_DIR "${CMAKE_CONTRIB_DIR}/craft"
         BINARY_DIR "${CMAKE_CONTRIB_DIR}/craft"
         #BUILD_IN_SOURCE TRUE
-        CONFIGURE_COMMAND "autoreconf -i && ./configure --enable-example"
+        # https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
+        CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure --enable-example
         BUILD_COMMAND "$(MAKE)"
         INSTALL_COMMAND ""
         TEST_COMMAND ""
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 0aadaccfa1..fa3bff41ae 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -42,7 +42,7 @@ endif(${BUILD_WITH_CRAFT})
 # bdb
 if(${BUILD_WITH_BDB})
     cat("${CMAKE_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(${BUILD_WITH_DBD})
+endif(${BUILD_WITH_BDB})
 
 # sqlite
 if(${BUILD_WITH_SQLITE})
@@ -154,11 +154,11 @@ if(${BUILD_WITH_CRAFT})
     add_library(craft STATIC IMPORTED GLOBAL)
     set_target_properties(craft PROPERTIES
         IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/craft/.libs/libraft.a"
-        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/craft"
-    )
-    target_link_libraries(craft
-        INTERFACE pthread
+        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/craft/include"
     )
+    # target_link_libraries(craft
+    #     INTERFACE pthread
+    # )
 endif(${BUILD_WITH_CRAFT})
 
 # BDB