]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #1455 in SNORT/snort3 from ~VIROEMER/snort3:fix-appid-detector...
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Thu, 6 Dec 2018 17:45:51 +0000 (12:45 -0500)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Thu, 6 Dec 2018 17:45:51 +0000 (12:45 -0500)
Squashed commit of the following:

commit 394acabaa5efff66a8cea0e4d3d833b4e143d0b9
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Wed Dec 5 18:54:07 2018 -0500

    tools: Install appid-detector-builder.sh with the other tools.

    appid-detector-builder.sh was being installed to the temporary CMake
    working directory and this is caught by bitbake which errors.

tools/CMakeLists.txt

index 0a22c4e15a92f8ec55e9ebe9389605ba899e1cd8..c71bd5501a9867130451623bd262fd17f706f8ee 100644 (file)
@@ -6,5 +6,5 @@ add_subdirectory(snort2lua)
 
 install (FILES appid_detector_builder.sh
     PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
-    DESTINATION "${PROJECT_BINARY_DIR}/tools"
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )