From dd7d13d244cdf5d680a9ec87bb4e40427afdd412 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 7 Jun 2022 10:02:39 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/timw/make-dist-deleting-build-files'

* origin/topic/timw/make-dist-deleting-build-files:
  Keep make dist from deleting all paths containing 'build' [skip ci]

(cherry picked from commit 31fa43b3df829483498b63762655662fddabdd42)
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a8abab6a9e..f60eb26672 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 5.0.0-rc1 | 2022-06-03 12:09:34 -0700
 
+  * Keep make dist from deleting all paths containing 'build' [skip ci] (Tim Wojtulewicz)
+
   * Remove duplicate entry about websockets from 5.0 NEWS (Tim Wojtulewicz, Corelight)
 
   * NEWS updates for 5.0 (Vern Paxson, Corelight)
diff --git a/Makefile b/Makefile
index 4ecd69a3f4..ed1020a8d1 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ dist:
 	@for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do (cd ../$(VERSION_FULL)/$$i && git reset -q --hard && git clean -ffdxq); done
 	@(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf)
 	@(cd ../$(VERSION_FULL) && find . -name \.idea -type d | xargs rm -rf)
-	@(cd ../$(VERSION_FULL) && find . -name build\* -type d | xargs rm -rf)
+	@(cd ../$(VERSION_FULL) && find . -maxdepth 1 -name build\* | xargs rm -rf)
 	@mv ../$(VERSION_FULL) .
 	@COPYFILE_DISABLE=true tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL)
 	@echo Package: $(VERSION_FULL).tar.gz