From c553df5dfe50d530dbf0da1cb79cf8db0660e0d6 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Wed, 24 Mar 2021 15:49:52 -0700
Subject: [PATCH] Add `bin_dir` setting for default zkg config file

Which defaults to `${zeek_install_prefix}/bin`, same as what a
standalone `zkg autoconfig` would use.
---
 CHANGES               | 8 ++++++++
 VERSION               | 2 +-
 auxil/package-manager | 2 +-
 zkg-config.in         | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index fa72c05e32..51786367a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+
+4.1.0-dev.402 | 2021-03-24 15:49:52 -0700
+
+  * Add `bin_dir` setting for default zkg config file (Jon Siwek, Corelight)
+
+    Which defaults to `${zeek_install_prefix}/bin`, same as what a
+    standalone `zkg autoconfig` would use.
+
 4.1.0-dev.400 | 2021-03-23 20:44:19 -0700
 
   * whitespace tweaks (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 94eb31d516..6513c5fba7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev.400
+4.1.0-dev.402
diff --git a/auxil/package-manager b/auxil/package-manager
index 7768b46d8c..ee49fd2932 160000
--- a/auxil/package-manager
+++ b/auxil/package-manager
@@ -1 +1 @@
-Subproject commit 7768b46d8c578df4046f6a6df5483056489cb5c4
+Subproject commit ee49fd2932474acd96b789a00d31e1e84a483e38
diff --git a/zkg-config.in b/zkg-config.in
index 7c3fbbd3cd..1d8dec61d2 100644
--- a/zkg-config.in
+++ b/zkg-config.in
@@ -6,3 +6,4 @@ zeek = https://github.com/zeek/packages
 state_dir = @ZEEK_ZKG_STATE_DIR@
 script_dir = @ZEEK_SCRIPT_INSTALL_PATH@/site
 plugin_dir = @BRO_PLUGIN_INSTALL_PATH@
+bin_dir = @CMAKE_INSTALL_PREFIX@/bin