From eff724410aad3fbaf5213c28e0ef73560e9a52cb Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 25 Jan 1997 08:47:55 +0000
Subject: [PATCH] do not use PATH, s/gcc/cc/, mouse@Rodents.Montreal.QC.CA
 netbsd pr#3138

---
 usr.bin/mkdep/mkdep.append       | 5 +----
 usr.bin/mkdep/mkdep.gcc.sh       | 9 +++------
 usr.bin/mkdep/mkdep.old.compiler | 4 +---
 usr.bin/mkdep/mkdep.sh           | 5 +----
 usr.bin/mkdep/mkdep.ultrix       | 5 +----
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/usr.bin/mkdep/mkdep.append b/usr.bin/mkdep/mkdep.append
index 44da8b5d1e4..bda5ab3fbf9 100644
--- a/usr.bin/mkdep/mkdep.append
+++ b/usr.bin/mkdep/mkdep.append
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: mkdep.append,v 1.3 1996/09/16 01:20:02 deraadt Exp $
+#	$OpenBSD: mkdep.append,v 1.4 1997/01/25 08:47:55 deraadt Exp $
 #	$NetBSD: mkdep.append,v 1.2 1994/12/23 07:34:57 jtc Exp $
 #
 # Copyright (c) 1991, 1993
@@ -37,9 +37,6 @@
 #	@(#)mkdep.append	8.1 (Berkeley) 6/6/93
 #
 
-PATH=/bin:/usr/bin:/usr/ucb
-export PATH
-
 MAKE=Makefile			# default makefile name is "Makefile"
 
 while :
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index 67b2c472883..d852cd0d6fc 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: mkdep.gcc.sh,v 1.4 1996/09/30 16:55:20 bitblt Exp $
+#	$OpenBSD: mkdep.gcc.sh,v 1.5 1997/01/25 08:47:56 deraadt Exp $
 #	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
 #
 # Copyright (c) 1991, 1993
@@ -37,9 +37,6 @@
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
 #
 
-PATH=/bin:/usr/bin:/usr/ucb
-export PATH
-
 D=.depend			# default dependency file is .depend
 append=0
 pflag=
@@ -84,9 +81,9 @@ umask $um
 trap 'rm -rf $DTMP ; exit 1' 1 2 3 13 15
 
 if [ x$pflag = x ]; then
-	gcc -M "$@" | sed -e 's; \./; ;g' > $TMP
+	cc -M "$@" | sed -e 's; \./; ;g' > $TMP
 else
-	gcc -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
+	cc -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
 fi
 
 if [ $? != 0 ]; then
diff --git a/usr.bin/mkdep/mkdep.old.compiler b/usr.bin/mkdep/mkdep.old.compiler
index 2d007c64129..9338fc3c0e1 100644
--- a/usr.bin/mkdep/mkdep.old.compiler
+++ b/usr.bin/mkdep/mkdep.old.compiler
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: mkdep.old.compiler,v 1.3 1996/09/16 01:20:02 deraadt Exp $
+#	$OpenBSD: mkdep.old.compiler,v 1.4 1997/01/25 08:47:57 deraadt Exp $
 #	$NetBSD: mkdep.old.compiler,v 1.2 1994/12/23 07:35:00 jtc Exp $
 #
 # Copyright (c) 1991, 1993
@@ -41,8 +41,6 @@
 # with compilers that don't have -M.
 MAKE=Makefile			# default makefile name is "Makefile"
 
-PATH=/bin:/usr/bin:/usr/ucb:/lib:/usr/lib
-
 INCL=
 
 while :
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index be303b0a8be..0536c8aa2fc 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: mkdep.sh,v 1.4 1996/09/30 16:55:19 bitblt Exp $
+#	$OpenBSD: mkdep.sh,v 1.5 1997/01/25 08:47:58 deraadt Exp $
 #	$NetBSD: mkdep.sh,v 1.3 1994/12/23 07:35:02 jtc Exp $
 #
 # Copyright (c) 1991, 1993
@@ -37,9 +37,6 @@
 #	@(#)mkdep.sh	8.1 (Berkeley) 6/6/93
 #
 
-PATH=/bin:/usr/bin:/usr/ucb:/usr/old/bin
-export PATH
-
 D=.depend			# default dependency file is .depend
 append=0
 
diff --git a/usr.bin/mkdep/mkdep.ultrix b/usr.bin/mkdep/mkdep.ultrix
index b908bd2697f..59d6a56358a 100644
--- a/usr.bin/mkdep/mkdep.ultrix
+++ b/usr.bin/mkdep/mkdep.ultrix
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: mkdep.ultrix,v 1.3 1996/09/16 01:20:03 deraadt Exp $
+#	$OpenBSD: mkdep.ultrix,v 1.4 1997/01/25 08:47:58 deraadt Exp $
 #	$NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $
 #
 # Copyright (c) 1991, 1993
@@ -37,9 +37,6 @@
 #	@(#)mkdep.ultrix	8.1 (Berkeley) 6/6/93
 #
 
-PATH=/bin:/usr/bin:/usr/ucb
-export PATH
-
 MAKE=Makefile			# default makefile name is "Makefile"
 
 while :
-- 
2.20.1