diff options
| -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 &&\ |
