build: move Makefile.prog, slightly refactor metabuild

There's no need for Makefile.prog to be at the top level.
Tarsnap · Mar 22, 2021 · 28d5e47 · 28d5e47
1 parent 9adfc7d
commit 28d5e47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Makefile.prog → release-tools/Makefile.prog b/Makefile.prog → release-tools/Makefile.prog
diff --git a/release-tools/metabuild.sh b/release-tools/metabuild.sh
@@ -44,12 +44,18 @@ copyvar() {
 }
 
 add_makefile_prog() {
+	# Get a copy of the default Makefile.prog
+	cp ${SUBDIR_DEPTH}/release-tools/Makefile.prog prog.tmp
+
+	# Remove the "install:" (if applicable)
 	if [ "$(${MAKEBSD} -V NOINST)" = "1" ]; then
-		perl -0pe 's/(install:.*?)\n\n//s'	\
-		    ${SUBDIR_DEPTH}/Makefile.prog >> $OUT
-	else
-		cat ${SUBDIR_DEPTH}/Makefile.prog >> $OUT
+		perl -0pe 's/(install:.*?)\n\n//s' prog.tmp > prog.tmp1
+		mv prog.tmp1 prog.tmp
 	fi
+
+	# Add the (adjusted) Makefile.prog to the Makefile, and clean up
+	cat prog.tmp >> $OUT
+	rm prog.tmp
 }
 
 get_cpusupport_cflags() {