Deleted Added
full compact
Makefile.inc1 (251443) Makefile.inc1 (251512)
1#
1#
2# $FreeBSD: head/Makefile.inc1 251443 2013-06-05 22:27:49Z jilles $
2# $FreeBSD: head/Makefile.inc1 251512 2013-06-07 21:40:02Z emaste $
3#
4# Make command line options:
5# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
6# -DNO_CLEAN do not clean at all
7# -DDB_FROM_SRC use the user/group databases in src/etc instead of
8# the system database when installing.
9# -DNO_SHARE do not go into share subdir
10# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}

--- 454 unchanged lines hidden (view full) ---

465 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
466 -p ${WORLDTMP}/legacy/usr >/dev/null
467.endif
468 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
469 -p ${WORLDTMP}/usr >/dev/null
470 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
471 -p ${WORLDTMP}/usr/include >/dev/null
472 ln -sf ${.CURDIR}/sys ${WORLDTMP}
3#
4# Make command line options:
5# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
6# -DNO_CLEAN do not clean at all
7# -DDB_FROM_SRC use the user/group databases in src/etc instead of
8# the system database when installing.
9# -DNO_SHARE do not go into share subdir
10# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}

--- 454 unchanged lines hidden (view full) ---

465 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
466 -p ${WORLDTMP}/legacy/usr >/dev/null
467.endif
468 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
469 -p ${WORLDTMP}/usr >/dev/null
470 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
471 -p ${WORLDTMP}/usr/include >/dev/null
472 ln -sf ${.CURDIR}/sys ${WORLDTMP}
473.if ${MK_DEBUG_FILES} != "no"
474 # We could instead disable debug files for these build stages
475 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
476 -p ${WORLDTMP}/legacy/usr/lib >/dev/null
477 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
478 -p ${WORLDTMP}/usr/lib >/dev/null
479.endif
473.if ${MK_BIND_LIBS} != "no"
474 mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
475 -p ${WORLDTMP}/usr/include >/dev/null
476.endif
477.for _mtree in ${LOCAL_MTREE}
478 mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
479.endfor
480_legacy:

--- 69 unchanged lines hidden (view full) ---

550 @echo "--------------------------------------------------------------"
551 @echo ">>> stage 5.1: building 32 bit shim libraries"
552 @echo "--------------------------------------------------------------"
553 mkdir -p ${LIB32TMP}/usr/include
554 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
555 -p ${LIB32TMP}/usr >/dev/null
556 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
557 -p ${LIB32TMP}/usr/include >/dev/null
480.if ${MK_BIND_LIBS} != "no"
481 mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
482 -p ${WORLDTMP}/usr/include >/dev/null
483.endif
484.for _mtree in ${LOCAL_MTREE}
485 mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
486.endfor
487_legacy:

--- 69 unchanged lines hidden (view full) ---

557 @echo "--------------------------------------------------------------"
558 @echo ">>> stage 5.1: building 32 bit shim libraries"
559 @echo "--------------------------------------------------------------"
560 mkdir -p ${LIB32TMP}/usr/include
561 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
562 -p ${LIB32TMP}/usr >/dev/null
563 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
564 -p ${LIB32TMP}/usr/include >/dev/null
565.if ${MK_DEBUG_FILES} != "no"
566 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
567 -p ${LIB32TMP}/usr/lib >/dev/null
568.endif
558 mkdir -p ${WORLDTMP}
559 ln -sf ${.CURDIR}/sys ${WORLDTMP}
560.for _t in obj includes
561 cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
562 cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
563.if ${MK_CDDL} != "no"
564 cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
565.endif

--- 208 unchanged lines hidden (view full) ---

774.for dist in ${EXTRA_DISTRIBUTIONS}
775 -mkdir ${DESTDIR}/${DISTDIR}/${dist}
776 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
777 -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
778 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
779 -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
780 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
781 -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
569 mkdir -p ${WORLDTMP}
570 ln -sf ${.CURDIR}/sys ${WORLDTMP}
571.for _t in obj includes
572 cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
573 cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
574.if ${MK_CDDL} != "no"
575 cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
576.endif

--- 208 unchanged lines hidden (view full) ---

785.for dist in ${EXTRA_DISTRIBUTIONS}
786 -mkdir ${DESTDIR}/${DISTDIR}/${dist}
787 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
788 -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
789 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
790 -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
791 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
792 -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
793.if ${MK_DEBUG_FILES} != "no"
794 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
795 -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
796.endif
782.if defined(NO_ROOT)
783 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
784 sed -e 's#^\./#./${dist}/#' >> ${METALOG}
785 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
786 sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
787 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
788 sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
789.endif

--- 1088 unchanged lines hidden ---
797.if defined(NO_ROOT)
798 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
799 sed -e 's#^\./#./${dist}/#' >> ${METALOG}
800 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
801 sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
802 ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
803 sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
804.endif

--- 1088 unchanged lines hidden ---