GC some old stuff

okay millert@

2 files changed, 5 insertions, 18 deletions

diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 78fc8b87021..167558c1af6 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.128 2019/01/31 10:27:28 espie Exp $
+.\"	$OpenBSD: make.1,v 1.129 2019/08/22 19:37:30 espie Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: January 31 2019 $
+.Dd $Mdocdate: August 22 2019 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -1495,8 +1495,7 @@ uses the following environment variables, if they exist:
 .Ev MACHINE_ARCH ,
 .Ev MACHINE_CPU ,
 .Ev MAKEFLAGS ,
-.Ev MAKEOBJDIR ,
-.Ev MAKEOBJDIRPREFIX ,
+.Ev MAKEOBJDIR
 and
 .Ev PWD .
 .Nm
@@ -1516,10 +1515,6 @@ does not exist
 system makefile
 .It Pa /usr/share/mk
 system makefile directory
-.It Pa /usr/obj
-default
-.Ev MAKEOBJDIRPREFIX
-directory
 .El
 .Sh EXIT STATUS
 If
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index e8e2dcd698d..a2b7074bd57 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.12 2010/07/19 19:46:44 espie Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.13 2019/08/22 19:37:30 espie Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.6 1996/11/06 17:59:21 christos Exp $	*/
 
 /*
@@ -32,18 +32,10 @@
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
  */
 
-#ifdef HAS_PATH_H
-# include <paths.h>
-#endif
-#ifndef _PATH_BSHELL
-# define _PATH_BSHELL	"/bin/sh"
-#endif
+#include <paths.h>
 #ifndef _PATH_OBJDIR
 #define _PATH_OBJDIR		"obj"
 #endif /* !_PATH_OBJDIR */
-#ifndef _PATH_OBJDIRPREFIX
-#define _PATH_OBJDIRPREFIX	"/usr/obj"
-#endif /* !_PATH_OBJDIRPREFIX */
 #ifndef _PATH_DEFSHELLDIR
 #define _PATH_DEFSHELLDIR	"/bin"
 #endif /* !_PATH_DEFSHELLDIR */