From aabd5a1c7b6fc387dcf93b8730e618433f455544 Mon Sep 17 00:00:00 2001
From: John Hay <jhay@FreeBSD.org>
Date: Sun, 20 Dec 1998 14:30:08 +0000
Subject: [PATCH] Split out afterdistribute and distribute from BKTGTS because
 they do need MK_ENV. This should make release work again. Maybe we should get
 rid of the /usr/obj/elf at some stage?

---
 Makefile.inc0 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc0 b/Makefile.inc0
index 419da3085f66..7b2a9bce7e72 100644
--- a/Makefile.inc0
+++ b/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc0,v 1.11 1998/10/17 15:25:26 bde Exp $
+#	$Id: Makefile.inc0,v 1.12 1998/12/16 11:45:51 ache Exp $
 #
 # This makefile ensures that the object directory is set according to the
 # object format to avoid mixing aout and elf formatted files during the
@@ -29,8 +29,8 @@ MAKE=	make -m ${.CURDIR}/share/mk -f Makefile.inc1
 #
 # These are the backend targets.
 #
-BKTGTS=	afterdistribute all checkdpadd clean cleandepend cleandir \
-	depend distribute everything hierarchy includes install installmost \
+BKTGTS=	all checkdpadd clean cleandepend cleandir \
+	depend everything hierarchy includes install installmost \
 	lint maninstall mk most obj objlink regress rerelease \
 	tags update
 
@@ -40,6 +40,14 @@ BKTGTS=	afterdistribute all checkdpadd clean cleandepend cleandir \
 ${BKTGTS} :
 	@cd ${.CURDIR}; ${MAKE} ${.TARGET}
 
+# These targets are used during a make release, which is done after a
+# make world, so they should use the same OBJDIRPREFIX that was used
+# during the make world.
+RELTGTS= afterdistribute distribute
+
+${RELTGTS} :
+	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} ${.TARGET}
+
 #
 # Temporary path and environment for the legacy build.
 #