Deleted Added
sdiff udiff text old ( 219136 ) new ( 219177 )
full compact
Makefile.inc1 (219136) Makefile.inc1 (219177)
1#
1#
2# $FreeBSD: head/Makefile.inc1 219136 2011-03-01 14:53:36Z jhb $
2# $FreeBSD: head/Makefile.inc1 219177 2011-03-02 14:39:26Z nwhitehorn $
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# -DNO_SHARE do not go into share subdir
8# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
9# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
10# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel

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

626# distributeworld
627#
628# Distributes everything compiled by a `buildworld'.
629#
630# installworld
631#
632# Installs everything compiled by a 'buildworld'.
633#
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# -DNO_SHARE do not go into share subdir
8# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
9# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
10# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel

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

626# distributeworld
627#
628# Distributes everything compiled by a `buildworld'.
629#
630# installworld
631#
632# Installs everything compiled by a 'buildworld'.
633#
634
635# Non-base distributions produced by the base system
636EXTRA_DISTRIBUTIONS= doc games
637.if defined(LIB32TMP) && ${MK_LIB32} != "no"
638EXTRA_DISTRIBUTIONS+= lib32
639.endif
640
634distributeworld installworld: installcheck
635 mkdir -p ${INSTALLTMP}
636 progs=$$(for prog in ${ITOOLS}; do \
637 if progpath=`which $$prog`; then \
638 echo $$progpath; \
639 else \
640 echo "Required tool $$prog not found in PATH." >&2; \
641 exit 1; \

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

648 echo $$2; \
649 else \
650 echo "Required library $$1 not found." >&2; \
651 exit 1; \
652 fi; \
653 done); \
654 cp $$libs $$progs ${INSTALLTMP}
655 cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
641distributeworld installworld: installcheck
642 mkdir -p ${INSTALLTMP}
643 progs=$$(for prog in ${ITOOLS}; do \
644 if progpath=`which $$prog`; then \
645 echo $$progpath; \
646 else \
647 echo "Required tool $$prog not found in PATH." >&2; \
648 exit 1; \

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

655 echo $$2; \
656 else \
657 echo "Required library $$1 not found." >&2; \
658 exit 1; \
659 fi; \
660 done); \
661 cp $$libs $$progs ${INSTALLTMP}
662 cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
663.if make(distributeworld)
664.for dist in ${EXTRA_DISTRIBUTIONS}
665 -mkdir ${DESTDIR}/${DISTDIR}/${dist}
666 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
667 -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
668 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
669 -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
670 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
671 -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
672.endfor
673 -mkdir ${DESTDIR}/${DISTDIR}/base
674 ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
675 DESTDIR=${DESTDIR}/${DISTDIR}/base
676.endif
656 ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
657 ${IMAKEENV} rm -rf ${INSTALLTMP}
677 ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
678 ${IMAKEENV} rm -rf ${INSTALLTMP}
679.if make(distributeworld)
680.for dist in ${EXTRA_DISTRIBUTIONS}
681 find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete
682.endfor
683.endif
658
684
685packageworld:
686.for dist in base ${EXTRA_DISTRIBUTIONS}
687 ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
688 tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz .
689.endfor
690
659#
660# reinstall
661#
662# If you have a build server, you can NFS mount the source and obj directories
663# and do a 'make reinstall' on the *client* to install new binaries from the
664# most recent server build.
665#
666reinstall:

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

835.endif
836 @echo "--------------------------------------------------------------"
837 @echo ">>> Installing kernel"
838 @echo "--------------------------------------------------------------"
839 cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
840 ${CROSSENV} PATH=${TMPPATH} \
841 ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
842
691#
692# reinstall
693#
694# If you have a build server, you can NFS mount the source and obj directories
695# and do a 'make reinstall' on the *client* to install new binaries from the
696# most recent server build.
697#
698reinstall:

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

867.endif
868 @echo "--------------------------------------------------------------"
869 @echo ">>> Installing kernel"
870 @echo "--------------------------------------------------------------"
871 cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
872 ${CROSSENV} PATH=${TMPPATH} \
873 ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
874
875distributekernel distributekernel.debug:
876.if empty(INSTALLKERNEL)
877 @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
878 false
879.endif
880 cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
881 ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
882 DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
883 ${.TARGET:S/distributekernel/install/}
884
885packagekernel:
886 ${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \
887 tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
888
843#
844# doxygen
845#
846# Build the API documentation with doxygen
847#
848doxygen:
849 @if [ ! -x `/usr/bin/which doxygen` ]; then \
850 echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \

--- 676 unchanged lines hidden --- 		889#
890# doxygen
891#
892# Build the API documentation with doxygen
893#
894doxygen:
895 @if [ ! -x `/usr/bin/which doxygen` ]; then \
896 echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \

--- 676 unchanged lines hidden ---