74c52c6526
Extend OptionalObsoleteFiles.inc to delete all lib32 files when MK_LIB32 is set to no on a system that previously had lib32 libraries installed. Also, to prevent "make delete-old-dirs" from always deleting lib32 directories after an installworld, move the lib32 subtree to its own mtree file that only gets applied when MK_LIB32=yes. Test: Ran "make delete-old" and "make delete-old-libs" on a system that never had MK_LIB32 enabled, and on a system where MK_LIB32 was enabled and later disabled. Did this both on amd64 and powerpc64. Test: Ran "make tinderbox" without errors. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D3923
34 lines
586 B
Makefile
34 lines
586 B
Makefile
# $FreeBSD$
|
|
|
|
.include <src.opts.mk>
|
|
|
|
FILES= ${_BSD.debug.dist} \
|
|
BSD.include.dist \
|
|
BSD.root.dist \
|
|
${_BSD.lib32.dist} \
|
|
${_BSD.sendmail.dist} \
|
|
${_BSD.tests.dist} \
|
|
BSD.usr.dist \
|
|
BSD.var.dist
|
|
|
|
.if ${MK_DEBUG_FILES} != "no"
|
|
_BSD.debug.dist= BSD.debug.dist
|
|
.endif
|
|
.if ${MK_GROFF} != "no"
|
|
_BSD.groff.dist= BSD.groff.dist
|
|
.endif
|
|
.if ${MK_LIB32} != "no"
|
|
_BSD.lib32.dist= BSD.lib32.dist
|
|
.endif
|
|
.if ${MK_SENDMAIL} != "no"
|
|
_BSD.sendmail.dist= BSD.sendmail.dist
|
|
.endif
|
|
.if ${MK_TESTS} != "no"
|
|
_BSD.tests.dist= BSD.tests.dist
|
|
.endif
|
|
|
|
NO_OBJ=
|
|
FILESDIR= /etc/mtree
|
|
|
|
.include <bsd.prog.mk>
|