diff -up bro-1.5.1/aux/broctl/BroControl/options.py.etcfix bro-1.5.1/aux/broctl/BroControl/options.py
--- bro-1.5.1/aux/broctl/BroControl/options.py.etcfix	2009-09-24 21:18:19.000000000 +0200
+++ bro-1.5.1/aux/broctl/BroControl/options.py	2010-09-16 13:57:14.179198747 +0200
@@ -31,7 +31,7 @@ options = [
     Option("DevMode", "0", "bool", Option.USER, False,
            "Enable development mode, which changes how things are installed by the _install_ command."),
 
-    Option("LogDir", "${BroBase}/logs", "string", Option.USER, False,
+    Option("LogDir", "BRO_LOGDIR", "string", Option.USER, False,
            "Directory for archived log files."),
 
     Option("SendMail", "1", "bool", Option.USER, False,
@@ -118,34 +118,34 @@ options = [
     Option("HaveBroccoli", "", "bool", Option.AUTOMATIC, False,
            "True if Broccoli interface is available."),
 
-    Option("BinDir", "${BroBase}/bin", "string", Option.AUTOMATIC, False,
+    Option("BinDir", "BRO_BINDIR", "string", Option.AUTOMATIC, False,
            "Directory for executable files."),
-    Option("ScriptsDir", "${BroBase}/share/broctl/scripts", "string", Option.AUTOMATIC, False,
+    Option("ScriptsDir", "BROCTL_SCRIPTSDIR", "string", Option.AUTOMATIC, False,
            "Directory for executable scripts shipping as part of broctl."),
-    Option("PostProcDir", "${BroBase}/share/broctl/scripts/postprocessors", "string", Option.AUTOMATIC, False,
+    Option("PostProcDir", "BROCTL_POSTPROCDIR", "string", Option.AUTOMATIC, False,
            "Directory for log postprocessors."),
-    Option("HelperDir", "${BroBase}/share/broctl/scripts/helpers", "string", Option.AUTOMATIC, False,
+    Option("HelperDir", "BROCTL_HELPERDIR", "string", Option.AUTOMATIC, False,
            "Directory for broctl helper scripts."),
-    Option("CfgDir", "${BroBase}/etc", "string", Option.AUTOMATIC, False,
+    Option("CfgDir", "BRO_CFGDIR", "string", Option.AUTOMATIC, False,
            "Directory for configuration files."),
-    Option("SpoolDir", "${BroBase}/spool", "string", Option.AUTOMATIC, False,
+    Option("SpoolDir", "BRO_SPOOLDIR", "string", Option.AUTOMATIC, False,
            "Directory for run-time data."),
-    Option("PolicyDir", "${BroBase}/share/bro", "string", Option.AUTOMATIC, False,
+    Option("PolicyDir", "BRO_POLICYDIR", "string", Option.AUTOMATIC, False,
            "Directory for standard policy files."),
-    Option("StaticDir", "${BroBase}/share/broctl", "string", Option.AUTOMATIC, False,
+    Option("StaticDir", "BROCTL_STATICDIR", "string", Option.AUTOMATIC, False,
            "Directory for static, arch-independent files."),
-    Option("TemplateDir", "${BroBase}/share/broctl/templates", "string", Option.AUTOMATIC, False,
+    Option("TemplateDir", "BROCTL_TEMPLATEDIR", "string", Option.AUTOMATIC, False,
            "Directory where the *.in templates are copied into."),
 
-    Option("LibDir", "${BroBase}/lib", "string", Option.AUTOMATIC, False,
+    Option("LibDir", "BRO_LIBDIR", "string", Option.AUTOMATIC, False,
            "Directory for library files."),
-    Option("LibDirInternal", "${BroBase}/lib/broctl", "string", Option.AUTOMATIC, False,
+    Option("LibDirInternal", "BROCTL_LIBDIR", "string", Option.AUTOMATIC, False,
            "Directory for broctl-specific library files."),
-    Option("TmpDir", "${SpoolDir}/tmp", "string", Option.AUTOMATIC, False,
+    Option("TmpDir", "BRO_TMPDIR", "string", Option.AUTOMATIC, False,
            "Directory for temporary data."),
-    Option("TmpExecDir", "${SpoolDir}/tmp", "string", Option.AUTOMATIC, False,
+    Option("TmpExecDir", "BRO_TMPEXECDIR", "string", Option.AUTOMATIC, False,
            "Directory where binaries are copied before execution."),
-    Option("StatsDir", "${LogDir}/stats", "string", Option.AUTOMATIC, False,
+    Option("StatsDir", "BRO_STATSDIR", "string", Option.AUTOMATIC, False,
            "Directory where statistics are kepts."),
 
     Option("TraceSummary", "${bindir}/trace-summary", "string", Option.AUTOMATIC, False,