1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-25 11:37:56 +00:00

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.
This commit is contained in:
Marcel Moolenaar 2000-11-21 04:37:30 +00:00
parent 4c6250e510
commit 0a0743b52a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=68987
3 changed files with 14 additions and 5 deletions

View File

@ -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

View File

@ -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
#

View File

@ -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 &&\