diff options
author | marcel <marcel@FreeBSD.org> | 2000-11-21 04:37:30 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2000-11-21 04:37:30 +0000 |
commit | da4d2f75d9eca5f19b86defef417d6c0d89fa459 (patch) | |
tree | d20e63a9f061d2a0c8a4137e7bffe9f7664a9c4e | |
parent | 77effa8060b37afac5cafb32e16704979b019057 (diff) | |
download | FreeBSD-src-da4d2f75d9eca5f19b86defef417d6c0d89fa459.zip FreeBSD-src-da4d2f75d9eca5f19b86defef417d6c0d89fa459.tar.gz |
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.
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | Makefile.inc1 | 9 | ||||
-rw-r--r-- | release/Makefile | 2 |
3 files changed, 14 insertions, 5 deletions
@@ -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 2a92102..4d09999 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -334,6 +334,15 @@ reinstall: .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 # # Which kernels to build and/or install is specified by setting diff --git a/release/Makefile b/release/Makefile index 1fa835f..7371499 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 &&\ |