Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Renaming of DATADIR CMake variable.

Browse source 
To POLICYDIR since that's more clear.  Also decided that restricting
it to a subdirectory of prefix isn't much use as an option, so went
back to having it be an absolute path.
This commit is contained in:
Jon Siwek 2010-11-13 20:41:30 -06:00
parent 7737572aab
commit 3c7c068685
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(Bro) project(Bro)
set(BRO_ROOT_DIR ${CMAKE_INSTALL_PREFIX}) set(BRO_ROOT_DIR ${CMAKE_INSTALL_PREFIX})
if (NOT POLICYDIR)
set(POLICYDIR ${BRO_ROOT_DIR}/share/bro)
endif ()
file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
@ -220,7 +223,7 @@ message(
"\n====================| Bro Build Summary |=====================" "\n====================| Bro Build Summary |====================="
"\n" "\n"
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}" "\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\nDatadir: ${DATADIR}" "\nPolicy dir: ${POLICYDIR}"
"\nDebug mode: ${ENABLE_DEBUG}" "\nDebug mode: ${ENABLE_DEBUG}"
"\nRelease mode: ${ENABLE_RELEASE}" "\nRelease mode: ${ENABLE_RELEASE}"
"\n" "\n"

8
configure vendored
View file

@ -19,7 +19,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
Installation Directories: Installation Directories:
--prefix=PREFIX installation directory [/usr/local/bro] --prefix=PREFIX installation directory [/usr/local/bro]
--datadir=DIR policy file installation subdirectory --policydir=PATH policy file installation directory
[PREFIX/share/bro] [PREFIX/share/bro]
Optional Features: Optional Features:
@ -72,7 +72,7 @@ CMakeCacheEntries=""
append_cache_entry CMAKE_INSTALL_PREFIX PATH /usr/local/bro append_cache_entry CMAKE_INSTALL_PREFIX PATH /usr/local/bro
append_cache_entry BRO_ROOT_DIR PATH /usr/local/bro append_cache_entry BRO_ROOT_DIR PATH /usr/local/bro
append_cache_entry PY_MOD_INSTALL_DIR PATH /usr/local/bro/lib/broctl append_cache_entry PY_MOD_INSTALL_DIR PATH /usr/local/bro/lib/broctl
append_cache_entry DATADIR STRING share/bro append_cache_entry POLICYDIR STRING /usr/local/bro/share/bro
append_cache_entry ENABLE_DEBUG BOOL false append_cache_entry ENABLE_DEBUG BOOL false
append_cache_entry ENABLE_RELEASE BOOL false append_cache_entry ENABLE_RELEASE BOOL false
append_cache_entry BROv6 BOOL false append_cache_entry BROv6 BOOL false
@ -100,8 +100,8 @@ while [ $# -ne 0 ]; do
append_cache_entry BRO_ROOT_DIR PATH $optarg append_cache_entry BRO_ROOT_DIR PATH $optarg
append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl
;; ;;
--datadir=*) --policydir=*)
append_cache_entry DATADIR STRING $optarg append_cache_entry POLICYDIR STRING $optarg
;; ;;
--enable-debug) --enable-debug)
append_cache_entry ENABLE_DEBUG BOOL true append_cache_entry ENABLE_DEBUG BOOL true

4
policy/CMakeLists.txt
View file

@ -1,4 +1,4 @@
install(DIRECTORY . DESTINATION ${DATADIR} FILES_MATCHING install(DIRECTORY . DESTINATION ${POLICYDIR} FILES_MATCHING
PATTERN "summaries" EXCLUDE PATTERN "summaries" EXCLUDE
PATTERN "all.bro" EXCLUDE PATTERN "all.bro" EXCLUDE
PATTERN "bro.init" PATTERN "bro.init"
@ -7,4 +7,4 @@ install(DIRECTORY . DESTINATION ${DATADIR} FILES_MATCHING
PATTERN "*.osf" PATTERN "*.osf"
) )
install(DIRECTORY DESTINATION ${DATADIR}/site) install(DIRECTORY DESTINATION ${POLICYDIR}/site)

4
src/CMakeLists.txt
View file

@ -375,7 +375,7 @@ set(bro_SRCS
${openssl_SRCS} ${openssl_SRCS}
) )
add_definitions(-DPOLICYDEST="${CMAKE_INSTALL_PREFIX}/${DATADIR}") add_definitions(-DPOLICYDEST="${POLICYDIR}")
add_executable(bro ${bro_SRCS}) add_executable(bro ${bro_SRCS})
@ -393,7 +393,7 @@ ChangeMacInstallNames(brolibs)
target_link_libraries(bro ${brolibs}) target_link_libraries(bro ${brolibs})
install(TARGETS bro DESTINATION bin) install(TARGETS bro DESTINATION bin)
install(FILES ${INSTALL_BIF_OUTPUTS} DESTINATION ${DATADIR}) install(FILES ${INSTALL_BIF_OUTPUTS} DESTINATION ${POLICYDIR})
set(BRO_EXE bro set(BRO_EXE bro
CACHE STRING "Bro executable binary" FORCE) CACHE STRING "Bro executable binary" FORCE)