From cda1976e4c5e599bfc413f4082c5a06e4bc8c28d Mon Sep 17 00:00:00 2001
From: Chase <nicetrynsa@protonmail.ch>
Date: Sun, 20 Dec 2020 01:31:26 +0000
Subject: [PATCH] Properly clean and ignore flat make binaries and libs

bin/package, src/cmd/INIT/package.sh:
- When running bin/package flat make clean, also clean the flat
  hierarchy binaries.

.gitignore:
- Ignore flat hierarchy binaries.
---
 .gitignore              | 35 +++++++++++++++++++++++++++++++++++
 bin/package             | 38 ++++++++++++++++++++++++++++++++++++++
 src/cmd/INIT/package.sh | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+)

diff --git a/.gitignore b/.gitignore
index ea00bbdca..85afe2d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,41 @@ arch
 tgz
 lcl
 
+# Flat make libs, binaries, etc
+bin/.paths
+bin/ar
+bin/cc
+bin/crossexec
+bin/ditto
+bin/filter
+bin/hurl
+bin/iffe
+bin/ksh
+bin/mamake
+bin/mktest
+bin/ok/
+bin/proto
+bin/pty
+bin/ratz
+bin/regress
+bin/release
+bin/rt
+bin/shcomp
+bin/suid_exec
+fun/
+include/
+lib/file/
+lib/lib/
+lib/libast.a
+lib/libcmd.a
+lib/libdll.a
+lib/libshell.a
+lib/libsum.a
+lib/make/
+lib/package/gen/
+lib/probe/
+man/
+
 # This one keeps changing its license header, causing git to show an
 # uncommitted file. It's always re-copied anyway, and not for direct
 # invocation, so exclude. The source file is: src/cmd/INIT/execrate.sh
diff --git a/bin/package b/bin/package
index d65a382b4..588bc7fd6 100755
--- a/bin/package
+++ b/bin/package
@@ -4967,6 +4967,44 @@ admin)	while	test ! -f $admin_db
 clean|clobber)
 	cd $PACKAGEROOT
 	$exec rm -rf arch/$HOSTTYPE
+	if	test "$flat" = 1
+	then	$exec rm -rf \
+			bin/.paths \
+			bin/ar \
+			bin/cc \
+			bin/crossexec \
+			bin/ditto \
+			bin/filter \
+			bin/hurl \
+			bin/iffe \
+			bin/ksh \
+			bin/mamake \
+			bin/mktest \
+			bin/ok/ \
+			bin/proto \
+			bin/pty \
+			bin/ratz \
+			bin/regress \
+			bin/release \
+			bin/rt \
+			bin/shcomp \
+			bin/suid_exec \
+			bin/*.old \
+			fun/ \
+			include/ \
+			lib/file/ \
+			lib/lib/ \
+			lib/libast.a \
+			lib/libcmd.a \
+			lib/libdll.a \
+			lib/libshell.a \
+			lib/libsum.a \
+			lib/*.old \
+			lib/make/ \
+			lib/package/gen/ \
+			lib/probe/ \
+			man/
+	fi
 	exit
 	;;
 
diff --git a/src/cmd/INIT/package.sh b/src/cmd/INIT/package.sh
index d2da9bdbb..626cc3cb9 100644
--- a/src/cmd/INIT/package.sh
+++ b/src/cmd/INIT/package.sh
@@ -4966,6 +4966,44 @@ admin)	while	test ! -f $admin_db
 clean|clobber)
 	cd $PACKAGEROOT
 	$exec rm -rf arch/$HOSTTYPE
+	if	test "$flat" = 1
+	then	$exec rm -rf \
+			bin/.paths \
+			bin/ar \
+			bin/cc \
+			bin/crossexec \
+			bin/ditto \
+			bin/filter \
+			bin/hurl \
+			bin/iffe \
+			bin/ksh \
+			bin/mamake \
+			bin/mktest \
+			bin/ok/ \
+			bin/proto \
+			bin/pty \
+			bin/ratz \
+			bin/regress \
+			bin/release \
+			bin/rt \
+			bin/shcomp \
+			bin/suid_exec \
+			bin/*.old \
+			fun/ \
+			include/ \
+			lib/file/ \
+			lib/lib/ \
+			lib/libast.a \
+			lib/libcmd.a \
+			lib/libdll.a \
+			lib/libshell.a \
+			lib/libsum.a \
+			lib/*.old \
+			lib/make/ \
+			lib/package/gen/ \
+			lib/probe/ \
+			man/
+	fi
 	exit
 	;;