Bring in my changes for removing the pestilent obj links (unless you

really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.

3 files changed, 9 insertions, 9 deletions

diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index 9f10e1e..08f0dcd 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,7 +1,7 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $
 
 SHELL=	/bin/sh
-ED=	../obj/ed
+ED=	${.OBJDIR}/ed
 
 all: check
 	@:
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 37a3d95..cacba41 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.9 1996/02/03 13:27:54 joerg Exp $
+#	$Id: Makefile,v 1.11 1996/06/02 17:06:39 phk Exp $
 
 PROG=	sh
 SRCS=	alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
@@ -27,7 +27,7 @@ ${.CURDIR}/builtins:
 	# just override the default rule
 
 builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins
-	cd ${.CURDIR}; sh mkbuiltins
+	cd ${.CURDIR} && env OBJDIR=${.OBJDIR} sh mkbuiltins
 
 init.c: mkinit ${SRCS}
 	./mkinit '${CC} -c ${CFLAGS} ${LDFLAGS} init.c' ${.ALLSRC}
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index e7f0d8d..104ded6 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,15 +35,15 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.1 (Berkeley) 5/31/93
-#	$Id: mkbuiltins,v 1.2 1994/09/24 02:57:53 davidg Exp $
+#	$Id: mkbuiltins,v 1.3 1995/03/30 19:45:20 phk Exp $
 
 temp=/tmp/ka$$
 havejobs=0
 if grep '^#define JOBS[	 ]*1' shell.h > /dev/null
 then	havejobs=1
 fi
-if [ -d obj ] ; then
-	exec > obj/builtins.c
+if [ -d ${OBJDIR} ] ; then
+	exec > ${OBJDIR}/builtins.c
 else
 	exec > builtins.c
 fi
@@ -71,8 +71,8 @@ awk '{	for (i = 2 ; i <= NF ; i++) {
 echo '	NULL, 0
 };'
 
-if [ -d obj ] ; then
-	exec > obj/builtins.h
+if [ -d ${OBJDIR} ] ; then
+	exec > ${OBJDIR}/builtins.h
 else
 	exec > builtins.h
 fi