From 0af6e47ccd104b02371c3018362a4eaf011f3e6a Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@remor.com>
Date: Fri, 8 Jul 2011 00:06:02 -0400
Subject: [PATCH] Removed the policy subpaths from the Bro core.

---
 bro-path-dev.in | 4 ++--
 src/util.cc     | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bro-path-dev.in b/bro-path-dev.in
index 18530bc48a..9bd4320b0d 100755
--- a/bro-path-dev.in
+++ b/bro-path-dev.in
@@ -10,10 +10,10 @@
 #     BROPATH=`./bro-path-dev` ./src/bro
 #
 
-broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/frameworks:${PROJECT_SOURCE_DIR}/policy/protocols:${PROJECT_SOURCE_DIR}/policy/detectors:${PROJECT_SOURCE_DIR}/policy/time-machine
+broPolicies=${PROJECT_SOURCE_DIR}/policy
 
 broGenPolicies=${CMAKE_BINARY_DIR}/src
 
-installedPolicies=${POLICYDIR}:${POLICYDIR}/frameworks:${POLICYDIR}/protocols:${POLICYDIR}/detectors:${POLICYDIR}/time-machine:${POLICYDIR}/site
+installedPolicies=${POLICYDIR}:${POLICYDIR}/site
 
 echo .:$broPolicies:$broGenPolicies
diff --git a/src/util.cc b/src/util.cc
index 9697285270..57700bb5fb 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -756,9 +756,6 @@ const char* bro_path()
 	if ( ! path )
 		path = ".:"
 			POLICYDEST ":"
-			POLICYDEST "/detectors:"
-			POLICYDEST "/frameworks:"
-			POLICYDEST "/protocols:"
 			POLICYDEST "/site";
 
 	return path;