From 0a0743b52a41a552fe27c4b29e9b62de29f6e213 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 21 Nov 2000 04:37:30 +0000
Subject: [PATCH] Fix release, broken by the perl cross-build fixes.

The distribute target is basicly the same as an install. For
perl, this means that miniperl is needed. Since miniperl is
only present in the object directory, we need to make sure
the path is set correctly. To do this, we have make release
use a new distribworld target that sets the path before doing
a make distribute.
---
 Makefile         | 8 ++++----
 Makefile.inc1    | 9 +++++++++
 release/Makefile | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 898eb0ac2d72..70b8ab6614ac 100644
--- a/Makefile
+++ b/Makefile
@@ -84,10 +84,10 @@
 # order, but that's not important.
 #
 TGTS=	afterdistribute all buildkernel buildworld checkdpadd clean \
-	cleandepend cleandir depend distribute everything hierarchy includes \
-	install installkernel reinstallkernel installmost installworld \
-	libraries lint maninstall mk most obj objlink regress rerelease \
-	tags update
+	cleandepend cleandir depend distribute distribworld everything \
+	hierarchy includes install installkernel reinstallkernel installmost \
+	installworld libraries lint maninstall mk most obj objlink regress \
+	rerelease tags update
 
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKE=	PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
diff --git a/Makefile.inc1 b/Makefile.inc1
index 2a92102578de..4d0999911d4a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -333,6 +333,15 @@ reinstall:
 	cd ${.CURDIR}/share/man; ${MAKE} makedb
 .endif
 
+#
+# distribworld
+#
+# Front-end to distribute to make sure the search path contains
+# the object directory. Needed for miniperl.
+#
+distribworld:
+	cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute
+
 #
 # buildkernel and installkernel
 #
diff --git a/release/Makefile b/release/Makefile
index 1fa835f7b3c6..737149926954 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -356,7 +356,7 @@ release.1:
 # Install the system into the various distributions.
 release.2:
 	cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/bin
-	cd ${.CURDIR}/.. && make distribute DISTDIR=${RD}/trees
+	cd ${.CURDIR}/.. && make distribworld DISTDIR=${RD}/trees
 .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
 	cd ${.CURDIR}/../kerberosIV && ( \
 		make bootstrap &&\