From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 6 Dec 2018 17:45:51 +0000 (-0500)
Subject: Merge pull request #1455 in SNORT/snort3 from ~VIROEMER/snort3:fix-appid-detector... 
X-Git-Tag: 3.0.0-250~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52f9789ff2e5daee0349c38fc7e5785cb92477a9;p=thirdparty%2Fsnort3.git

Merge pull request #1455 in SNORT/snort3 from ~VIROEMER/snort3:fix-appid-detector-builder-install to master

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.
---

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 0a22c4e15..c71bd5501 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -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}"
 )