From: rcombs Date: Thu, 4 Dec 2014 02:14:00 +0000 (-0500) Subject: undo change pending further testing X-Git-Tag: 3.0.0-233~1118 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5f095b630675b3ea1279ca55f4ed3aee39ecbe2;p=thirdparty%2Fsnort3.git undo change pending further testing --- diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 8d44aeac2..560ebd465 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -85,7 +85,6 @@ else () CACHE FILEPATH "contains a pre-built snort_manual.tgz" FORCE) set (IMAGES_TGZ_FOUND "IMAGES_TGZ_FOUND-NOTFOUND" CACHE FILEPATH "contains a pre-built images.tgz" FORCE) - set (SNORT_MANUAL_CHUNKED "") find_file ( SNORT_MANUAL_HTML_FOUND @@ -347,22 +346,10 @@ foreach (file ${EXTRA_DIST}) endforeach(file) add_custom_target(snort_manuals ALL DEPENDS ${BUILT_DIST}) - -if ("${BUILT_DIST}" ) - install (FILES ${BUILT_DIST} DESTINATION "${SNORT_DATA_DIR}") -endif() - -if ("${PACKAGED_DIST}") - install (FILES ${PACKAGED_DIST} DESTINATION "${SNORT_DATA_DIR}") -endif() - -if ("${UNBUILT_SOURCES}") - install (FILES ${UNBUILT_SOURCES} DESTINATION "${SNORT_DATA_DIR}") -endif() - -if ("${SNORT_MANUAL_CHUNKED}") - install (DIRECTORY ${SNORT_MANUAL_CHUNKED}/ DESTINATION "${SNORT_DATA_DIR}/snort_manual") -endif() +install (FILES ${BUILT_DIST} DESTINATION "${SNORT_DATA_DIR}") +install (FILES ${PACKAGED_DIST} DESTINATION "${SNORT_DATA_DIR}") +install (FILES ${UNBUILT_SOURCES} DESTINATION "${SNORT_DATA_DIR}") +install (DIRECTORY ${SNORT_MANUAL_CHUNKED}/ DESTINATION "${SNORT_DATA_DIR}/snort_manual") set_property( DIRECTORY