From: tb <tb@openbsd.org>
Date: Fri, 12 Apr 2024 02:51:52 +0000 (+0000)
Subject: gnu/cvs: avoid a harmless configure warning
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=90c45c291d1158419d04fe7e78be7c295dd8c78e;p=openbsd

gnu/cvs: avoid a harmless configure warning

Ever since the prehistoric zlib was removed last fall, the configure script
would complain because of a missing file:
sed: 0: /usr/src/gnu/usr.bin/cvs/zlib/Makefile.in: No such file or directory

noticed by deraadt
ok bluhm
---

diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index b4cf6223423..722f0dc92fe 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -4512,7 +4512,7 @@ trap 'rm -fr `echo "Makefile \
 	  vms/Makefile \
 	  windows-NT/Makefile \
 	  windows-NT/SCC/Makefile \
-	  zlib/Makefile config.h src/options.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+	  config.h src/options.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4655,8 +4655,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile \
 	  tools/Makefile \
 	  vms/Makefile \
 	  windows-NT/Makefile \
-	  windows-NT/SCC/Makefile \
-	  zlib/Makefile"}
+	  windows-NT/SCC/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/gnu/usr.bin/cvs/configure.in b/gnu/usr.bin/cvs/configure.in
index 6329cbf44c3..1352d3837c4 100644
--- a/gnu/usr.bin/cvs/configure.in
+++ b/gnu/usr.bin/cvs/configure.in
@@ -427,8 +427,7 @@ AC_OUTPUT([Makefile \
 	  tools/Makefile \
 	  vms/Makefile \
 	  windows-NT/Makefile \
-	  windows-NT/SCC/Makefile \
-	  zlib/Makefile],
+	  windows-NT/SCC/Makefile],
 	  [chmod -f +x \
 	  contrib/clmerge \
 	  contrib/cln_hist \