Deleted Added
sdiff udiff text old ( 246096 ) new ( 246097 )
full compact
Makefile.inc1 (246096) Makefile.inc1 (246097)
1#
1#
2# $FreeBSD: head/Makefile.inc1 246096 2013-01-29 21:48:10Z brooks $
2# $FreeBSD: head/Makefile.inc1 246097 2013-01-29 22:17:58Z brooks $
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}

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

180.endif
181.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
182OBJTREE= ${MAKEOBJDIRPREFIX}
183.else
184OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
185.endif
186WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
187# /usr/games added for fortune which depend on strfile
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}

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

180.endif
181.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
182OBJTREE= ${MAKEOBJDIRPREFIX}
183.else
184OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
185.endif
186WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
187# /usr/games added for fortune which depend on strfile
188BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
188BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
189XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
190STRICTTMPPATH= ${BPATH}:${XPATH}
191TMPPATH= ${STRICTTMPPATH}:${PATH}
192
193#
194# Avoid running mktemp(1) unless actually needed.
195# It may not be functional, e.g., due to new ABI
196# when in the middle of installing over this system.

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

407.else
408 rm -rf ${WORLDTMP}/legacy/usr/include
409# XXX - These three can depend on any header file.
410 rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
411 rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
412 rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
413.endif
414.for _dir in \
189XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
190STRICTTMPPATH= ${BPATH}:${XPATH}
191TMPPATH= ${STRICTTMPPATH}:${PATH}
192
193#
194# Avoid running mktemp(1) unless actually needed.
195# It may not be functional, e.g., due to new ABI
196# when in the middle of installing over this system.

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

407.else
408 rm -rf ${WORLDTMP}/legacy/usr/include
409# XXX - These three can depend on any header file.
410 rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
411 rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
412 rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
413.endif
414.for _dir in \
415 lib usr legacy/usr
415 lib usr legacy/bin legacy/usr
416 mkdir -p ${WORLDTMP}/${_dir}
417.endfor
418 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
419 -p ${WORLDTMP}/legacy/usr >/dev/null
420.if ${MK_GROFF} != "no"
421 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
422 -p ${WORLDTMP}/legacy/usr >/dev/null
423.endif

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

1131
1132.if ${BOOTSTRAPPING} < 1000026
1133_nmtree= lib/libnetbsd \
1134 usr.sbin/nmtree
1135.else
1136_nmtree_itools= nmtree
1137.endif
1138
416 mkdir -p ${WORLDTMP}/${_dir}
417.endfor
418 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
419 -p ${WORLDTMP}/legacy/usr >/dev/null
420.if ${MK_GROFF} != "no"
421 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
422 -p ${WORLDTMP}/legacy/usr >/dev/null
423.endif

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

1131
1132.if ${BOOTSTRAPPING} < 1000026
1133_nmtree= lib/libnetbsd \
1134 usr.sbin/nmtree
1135.else
1136_nmtree_itools= nmtree
1137.endif
1138
1139.if ${BOOTSTRAPPING} < 1000027
1140_cat= bin/cat
1141.endif
1142
1139.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
1140_awk= usr.bin/awk
1141.endif
1142
1143.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
1144_gensnmptree= usr.sbin/bsnmpd/gensnmptree
1145.endif
1146

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

1186 ${_kerberos5_bootstrap_tools} \
1187 ${_dtrace_tools} \
1188 ${_strfile} \
1189 ${_gperf} \
1190 ${_groff} \
1191 ${_ar} \
1192 ${_dtc} \
1193 ${_awk} \
1143.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
1144_awk= usr.bin/awk
1145.endif
1146
1147.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
1148_gensnmptree= usr.sbin/bsnmpd/gensnmptree
1149.endif
1150

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

1190 ${_kerberos5_bootstrap_tools} \
1191 ${_dtrace_tools} \
1192 ${_strfile} \
1193 ${_gperf} \
1194 ${_groff} \
1195 ${_ar} \
1196 ${_dtc} \
1197 ${_awk} \
1198 ${_cat} \
1194 usr.bin/lorder \
1195 usr.bin/makewhatis \
1196 ${_mklocale} \
1197 usr.bin/rpcgen \
1198 ${_sed} \
1199 ${_yacc} \
1200 ${_lex} \
1201 usr.bin/xinstall \

--- 608 unchanged lines hidden --- 		1199 usr.bin/lorder \
1200 usr.bin/makewhatis \
1201 ${_mklocale} \
1202 usr.bin/rpcgen \
1203 ${_sed} \
1204 ${_yacc} \
1205 ${_lex} \
1206 usr.bin/xinstall \

--- 608 unchanged lines hidden ---