===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/pathnames.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/make/pathnames.h	2010/07/19 19:46:44	1.12
+++ src/usr.bin/make/pathnames.h	2019/08/22 19:37:30	1.13
@@ -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 */