Merge remote-tracking branch 'origin/topic/dnthayer/gh-313'

* origin/topic/dnthayer/gh-313: Rename directories from bro to zeek
zeek · Jun 12, 2019 · e0689c1 · e0689c1
2 parents 892b9e7 + 63ab9d0
commit e0689c1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,10 @@
 
+0.42-28 | 2019-06-12 15:04:43 -0700
+
+  * Rename directories from bro to zeek (Daniel Thayer)
+
+    Also updated a test to use zeek.
+
 0.42-26 | 2019-06-12 10:33:37 -0700
 
   * Use zkg.meta file in plugin skeleton (Jon Siwek, Corelight)

diff --git a/README b/README
@@ -1,7 +1,7 @@
 .. -*- mode: rst; -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.42-26
+.. |version| replace:: 0.42-28
 
 =======================
 Zeek Auxiliary Programs

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.42-26
+0.42-28
diff --git a/cmake b/cmake
diff --git a/configure b/configure
@@ -20,7 +20,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --builddir=DIR         place build files in directory [build]
 
   Installation Directories:
-    --prefix=PREFIX        installation directory [/usr/local/bro]
+    --prefix=PREFIX        installation directory [/usr/local/zeek]
 
   Optional Features:
     --enable-debug         compile in debugging mode
@@ -53,7 +53,7 @@ append_cache_entry () {
 # set defaults
 builddir=build
 CMakeCacheEntries=""
-append_cache_entry CMAKE_INSTALL_PREFIX PATH   /usr/local/bro
+append_cache_entry CMAKE_INSTALL_PREFIX PATH   /usr/local/zeek
 append_cache_entry ENABLE_DEBUG         BOOL   false
 
 # parse arguments