From 3c7c0686853f76983c486f08db523644f692b117 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Sat, 13 Nov 2010 20:41:30 -0600
Subject: [PATCH] Renaming of DATADIR CMake variable.

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.
---
 CMakeLists.txt        | 5 ++++-
 configure             | 8 ++++----
 policy/CMakeLists.txt | 4 ++--
 src/CMakeLists.txt    | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891e29355f..c8a9864279 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 project(Bro)
 
 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)
 
@@ -220,7 +223,7 @@ message(
     "\n====================|  Bro Build Summary  |====================="
     "\n"
     "\nInstall prefix:    ${CMAKE_INSTALL_PREFIX}"
-    "\nDatadir:           ${DATADIR}"
+    "\nPolicy dir:        ${POLICYDIR}"
     "\nDebug mode:        ${ENABLE_DEBUG}"
     "\nRelease mode:      ${ENABLE_RELEASE}"
     "\n"
diff --git a/configure b/configure
index 81b8887604..81dfec950d 100755
--- a/configure
+++ b/configure
@@ -19,7 +19,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
 
   Installation Directories:
     --prefix=PREFIX        installation directory [/usr/local/bro]
-    --datadir=DIR          policy file installation subdirectory
+    --policydir=PATH       policy file installation directory
                            [PREFIX/share/bro]
 
   Optional Features:
@@ -72,7 +72,7 @@ CMakeCacheEntries=""
 append_cache_entry CMAKE_INSTALL_PREFIX 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 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_RELEASE       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 PY_MOD_INSTALL_DIR   PATH   $optarg/lib/broctl
             ;;
-        --datadir=*)
-            append_cache_entry DATADIR              STRING $optarg
+        --policydir=*)
+            append_cache_entry POLICYDIR            STRING $optarg
             ;;
         --enable-debug)
             append_cache_entry ENABLE_DEBUG         BOOL   true
diff --git a/policy/CMakeLists.txt b/policy/CMakeLists.txt
index 6622b43276..cda588a9a5 100644
--- a/policy/CMakeLists.txt
+++ b/policy/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(DIRECTORY . DESTINATION ${DATADIR} FILES_MATCHING
+install(DIRECTORY . DESTINATION ${POLICYDIR} FILES_MATCHING
         PATTERN "summaries" EXCLUDE
         PATTERN "all.bro" EXCLUDE
         PATTERN "bro.init"
@@ -7,4 +7,4 @@ install(DIRECTORY . DESTINATION ${DATADIR} FILES_MATCHING
         PATTERN "*.osf"
 )
 
-install(DIRECTORY DESTINATION ${DATADIR}/site)
+install(DIRECTORY DESTINATION ${POLICYDIR}/site)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bffff82377..576ad1a844 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -375,7 +375,7 @@ set(bro_SRCS
     ${openssl_SRCS}
 )
 
-add_definitions(-DPOLICYDEST="${CMAKE_INSTALL_PREFIX}/${DATADIR}")
+add_definitions(-DPOLICYDEST="${POLICYDIR}")
 
 add_executable(bro ${bro_SRCS})
 
@@ -393,7 +393,7 @@ ChangeMacInstallNames(brolibs)
 target_link_libraries(bro ${brolibs})
 
 install(TARGETS bro DESTINATION bin)
-install(FILES ${INSTALL_BIF_OUTPUTS} DESTINATION ${DATADIR})
+install(FILES ${INSTALL_BIF_OUTPUTS} DESTINATION ${POLICYDIR})
 
 set(BRO_EXE bro
     CACHE STRING "Bro executable binary" FORCE)