fixing installed files and directories

diff --git a/cmake/create_options.cmake b/cmake/create_options.cmake
index 6202ea1f8e25ea37a952cf7c23199d916c6977b3..a69b5d0051098c3e2a90259f468dd78cb48bccb3 100644 (file)
--- a/cmake/create_options.cmake
+++ b/cmake/create_options.cmake
@@ -43,5 +43,5 @@ set (SIGNAL_SNORT_READ_ATTR_TBL "" CACHE STRING "set the SIGNAL_SNORT_READ_ATTR_
 
 
 #Setting default directories...appended to INSTALL_PREFIX unless a full path is provided
-set (SNORT_DATA_DIR share/doc/${CMAKE_PROJECT_NAME})
+set (SNORT_DATA_DIR share/${CMAKE_PROJECT_NAME})
 

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2ed62009b145e30e51d348ab379a263c6d1e4f04..5f229fd6127c2c8f2b3c8a1a9c69aeeee0405cc1 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -16,6 +16,7 @@
 set(HELP_SOURCES
     commands.txt
     config.txt
+    counts.txt
     modules.txt
     plugins.txt
     options.txt
@@ -282,7 +283,5 @@ add_custom_target(snort_manuals ALL
 #add_dependencies(snort_manuals snort ${ALL_SOURCES})
 
 
-
-install (FILES ${EXTRA_DIST_BINARY_PATH}
-    DESTINATION "doc"
-)
+install (FILES ${EXTRA_DIST_BINARY_PATH} DESTINATION "${SNORT_DATA_DIR}/doc")
+install (FILES ${UNBUILT_SOURCES} DESTINATION "${SNORT_DATA_DIR}/doc")

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3dfb1d924ca8c4f340555b4078a08948aa9297d9..85ba05f92313af9e865ca5a9ad26e62ca16509ec 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=foreign no-dependencies
 
-docdir = ${prefix}/doc
+docdir = ${datadir}/snort/doc
 
 BUILT_SOURCES = \
 builtin.txt \

diff --git a/extra/src/inspectors/dpx.cc b/extra/src/inspectors/dpx.cc
index 4e8e4e94902b7410d0e25adb609582b7bfe3f1ef..ce0c5d1c2bc49099323336c963c95d73b21db043 100644 (file)
--- a/extra/src/inspectors/dpx.cc
+++ b/extra/src/inspectors/dpx.cc
@@ -112,7 +112,7 @@ public:
     DpxModule() : Module(s_name, s_help)
     { };
 
-    const char** get_pegs() const override
+    const PegInfo* get_pegs() const
     { return simple_pegs; };
 
     PegCount* get_counts() const override

diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
index 47397d709658f0fc4fc6655f2bee792ac5478e17..11f48d6ae80ed76f34ab9b9f76aa83c38e22ab7b 100644 (file)
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@@ -8,7 +8,5 @@ set (LUA_SCRIPTS
 )
 
 install (FILES ${LUA_SCRIPTS}
-    DESTINATION "conf"
+    DESTINATION "${SNORT_DATA_DIR}/lua"
 )
-
-set(ENV{LUA_PATH} "${CMAKE_INSTALL_PREFIX}/include/snort/lua/?.lua\;\;")

diff --git a/lua/Makefile.am b/lua/Makefile.am
index ec0f7a08ccc721e2d4af844e0e831a16b3dff793..8382a26a1970387814f5d1430fa752adbe198a52 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=foreign no-dependencies
 
-x_includedir = $(sysconfdir)
+x_includedir = $(datadir)/snort/lua
 
 x_include_HEADERS = \
 snort.lua \
@@ -8,10 +8,3 @@ snort_defaults.lua \
 classification.lua \
 reference.lua \
 sample.rules
-
-#EXTRA_DIST = \
-#snort.lua \
-#snort_defaults.lua \
-#classification.lua \
-#reference.lua
-

diff --git a/src/framework/decode_data.h b/src/framework/decode_data.h
index 43e633ca0ca77017f04d3983b7f827a7be8d8e69..e422c0a0fc49d1879e0db3ec95b70628e8016194 100644 (file)
--- a/src/framework/decode_data.h
+++ b/src/framework/decode_data.h
@@ -25,7 +25,6 @@
 
 #include "protocols/mpls.h"
 #include "protocols/ip.h"
-#include "main/policy.h"
 
 
 namespace tcp
@@ -61,10 +60,10 @@ enum class PktType : std::uint8_t
 enum DecodeFlags : std::uint16_t
 {
     /* error flags */
-    DECODE_ERR_CKSUM_IP = CHECKSUM_FLAG__IP, // == 0x0001,
-    DECODE_ERR_CKSUM_TCP = CHECKSUM_FLAG__TCP, // == 0x002,
-    DECODE_ERR_CKSUM_UDP = CHECKSUM_FLAG__UDP, // 0x0004,
-    DECODE_ERR_CKSUM_ICMP = CHECKSUM_FLAG__ICMP, // 0x0008,
+    DECODE_ERR_CKSUM_IP = 0x0001,
+    DECODE_ERR_CKSUM_TCP = 0x0002,
+    DECODE_ERR_CKSUM_UDP = 0x0004,
+    DECODE_ERR_CKSUM_ICMP = 0x0008,
     DECODE_ERR_BAD_TTL = 0x0010,
 
     DECODE_ERR_CKSUM_ALL = ( DECODE_ERR_CKSUM_IP | DECODE_ERR_CKSUM_TCP |
@@ -77,15 +76,6 @@ enum DecodeFlags : std::uint16_t
     DECODE_MF = 0x0080,
 };
 
-static_assert(((uint16_t)DECODE_ERR_CKSUM_IP) < 0x0010,
-    "CHECKSUM_FLAG__IP must be less than 0x00100!!");
-static_assert(((uint16_t)DECODE_ERR_CKSUM_TCP) < 0x0010,
-    "DECODE_ERR_CKSUM_TCP must be less than 0x00100!!");
-static_assert(((uint16_t)DECODE_ERR_CKSUM_UDP) < 0x0010,
-    "DECODE_ERR_CKSUM_UDP must be less than 0x00100!!");
-static_assert(((uint16_t)DECODE_ERR_CKSUM_ICMP) < 0x0010,
-    "DECODE_ERR_CKSUM_ICMP must be less than 0x00100!!");
-
 
 // FIXIT-L J make this an enum!!
 #define PROTO_BIT__NONE     0x0000

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 046bb64dd15823f30475788b1ba7d9a8c1d82506..55c5f9fbff402235d79b25ee3e3ab5a15e8f342a 100644 (file)
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -5,7 +5,6 @@ set (INCLUDES
     snort_types.h
     snort.h
     snort_config.h
-    policy.h
 )
 
 add_library (main STATIC
@@ -17,6 +16,7 @@ add_library (main STATIC
     modules.cc
     modules.h
     policy.cc
+    policy.h
     shell.h
     shell.cc
     snort.h

diff --git a/src/packet_io/CMakeLists.txt b/src/packet_io/CMakeLists.txt
index 5e816577d98d5709f1a54673b38446ac390dccce..384cbca35ccf68f3a2f391d2266a687ac650039e 100644 (file)
--- a/src/packet_io/CMakeLists.txt
+++ b/src/packet_io/CMakeLists.txt
@@ -1,19 +1,11 @@
 
-set (PACKET_IO_INCLUDES
-    active.h
-)
-
 add_library (packet_io STATIC
     active.cc
+    active.h
     intf.cc
     intf.h
     sfdaq.cc
     sfdaq.h
     trough.cc
     trough.h
-    ${PACKET_IO_INCLUDES}
-)
-
-install (FILES ${PACKET_IO_INCLUDES}
-    DESTINATION "${INCLUDE_INSTALL_PATH}/packet_io"
 )

diff --git a/src/sfrt/CMakeLists.txt b/src/sfrt/CMakeLists.txt
index 699e19ecba42619fc0668963c82aa748d35123b4..0628318b1f02fd4776bdb1791815219ff71d0ab0 100644 (file)
--- a/src/sfrt/CMakeLists.txt
+++ b/src/sfrt/CMakeLists.txt
@@ -1,12 +1,21 @@
 
-add_library ( sfrt STATIC
-    sfrt.cc
+
+set ( SFRT_INCLUDES
     sfrt.h
     sfrt_trie.h
-    sfrt_dir.cc
     sfrt_dir.h
-    sfrt_flat.cc
     sfrt_flat.h
-    sfrt_flat_dir.cc
     sfrt_flat_dir.h
 )
+
+add_library ( sfrt STATIC
+    sfrt.cc
+    sfrt_dir.cc
+    sfrt_flat.cc
+    sfrt_flat_dir.cc
+    ${SFRT_INCLUDES}
+)
+
+install (FILES ${SFRT_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/sfrt"
+)

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 67dda67fbbb96ac2770ca604e661053c3abe400b..8cefd70625cd3bb24c3381a20f050c2ae97a0337 100644 (file)
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -22,7 +22,6 @@ set( UTIL_INCLUDES
     sfportobject.h
     snort_bounds.h
     stats.h
-    util.h
 )
 
 ADD_LIBRARY( utils STATIC
@@ -46,8 +45,9 @@ ADD_LIBRARY( utils STATIC
     sfsnprintfappend.h
     strvec.cc 
     strvec.h
-    stats.cc 
-    util.cc 
+    stats.cc
+    util.cc
+    util.h
     util_jsnorm.cc 
     util_jsnorm.h
     util_math.cc 

diff --git a/tools/u2boat/CMakeLists.txt b/tools/u2boat/CMakeLists.txt
index 7717327e296152ac102e515398b730f6b686c92d..bcd765dc71637002dea16b7a95ce659a2dd431df 100644 (file)
--- a/tools/u2boat/CMakeLists.txt
+++ b/tools/u2boat/CMakeLists.txt
@@ -10,15 +10,11 @@ target_link_libraries( u2boat
     ${PCAP_LIBRARIES}
 )
 
-#add_compile_flags(u2boat ${AM_CFLAGS})
-
-set( AM_CXXFLAGS ${AM_CXXFLAGS} ${EXTRA_INCL}]})
 
 install (TARGETS u2boat
     RUNTIME DESTINATION bin
 )
 
 install(FILES README.u2boat
-    DESTINATION ${SNORT_DATA_DIR}
+    DESTINATION "${SNORT_DATA_DIR}/doc"
 )
-

diff --git a/tools/u2boat/Makefile.am b/tools/u2boat/Makefile.am
index 7a2bdfe4c2c0ef428aedc84d399dfb5ede0518b5..87578ffc413c3c5fdaf295d5db74eb3cd6ca0058 100644 (file)
--- a/tools/u2boat/Makefile.am
+++ b/tools/u2boat/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS=foreign
 bin_PROGRAMS = u2boat
 
-docdir = ${datadir}/doc/${PACKAGE}
+docdir = ${datadir}/${PACKAGE}/doc
 
 u2boat_SOURCES = u2boat.cc u2boat.h
 u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS)