2c2
< # $FreeBSD: head/Makefile.inc1 219136 2011-03-01 14:53:36Z jhb $
---
> # $FreeBSD: head/Makefile.inc1 219177 2011-03-02 14:39:26Z nwhitehorn $
633a634,640
>
> # Non-base distributions produced by the base system
> EXTRA_DISTRIBUTIONS= doc games
> .if defined(LIB32TMP) && ${MK_LIB32} != "no"
> EXTRA_DISTRIBUTIONS+= lib32
> .endif
>
655a663,676
> .if make(distributeworld)
> .for dist in ${EXTRA_DISTRIBUTIONS}
> -mkdir ${DESTDIR}/${DISTDIR}/${dist}
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
> .endfor
> -mkdir ${DESTDIR}/${DISTDIR}/base
> ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
> DESTDIR=${DESTDIR}/${DISTDIR}/base
> .endif
657a679,683
> .if make(distributeworld)
> .for dist in ${EXTRA_DISTRIBUTIONS}
> find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete
> .endfor
> .endif
658a685,690
> packageworld:
> .for dist in base ${EXTRA_DISTRIBUTIONS}
> ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
> tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz .
> .endfor
>
842a875,888
> distributekernel distributekernel.debug:
> .if empty(INSTALLKERNEL)
> @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
> false
> .endif
> cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
> DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
> ${.TARGET:S/distributekernel/install/}
>
> packagekernel:
> ${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \
> tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
>
< # $FreeBSD: head/Makefile.inc1 219136 2011-03-01 14:53:36Z jhb $
---
> # $FreeBSD: head/Makefile.inc1 219177 2011-03-02 14:39:26Z nwhitehorn $
633a634,640
>
> # Non-base distributions produced by the base system
> EXTRA_DISTRIBUTIONS= doc games
> .if defined(LIB32TMP) && ${MK_LIB32} != "no"
> EXTRA_DISTRIBUTIONS+= lib32
> .endif
>
655a663,676
> .if make(distributeworld)
> .for dist in ${EXTRA_DISTRIBUTIONS}
> -mkdir ${DESTDIR}/${DISTDIR}/${dist}
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
> mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
> -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
> .endfor
> -mkdir ${DESTDIR}/${DISTDIR}/base
> ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
> DESTDIR=${DESTDIR}/${DISTDIR}/base
> .endif
657a679,683
> .if make(distributeworld)
> .for dist in ${EXTRA_DISTRIBUTIONS}
> find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete
> .endfor
> .endif
658a685,690
> packageworld:
> .for dist in base ${EXTRA_DISTRIBUTIONS}
> ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
> tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz .
> .endfor
>
842a875,888
> distributekernel distributekernel.debug:
> .if empty(INSTALLKERNEL)
> @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
> false
> .endif
> cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
> DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
> ${.TARGET:S/distributekernel/install/}
>
> packagekernel:
> ${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \
> tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
>