From e493781a2c9c273e3357e9301ae29260d6691181 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Sat, 16 Jan 2010 20:42:50 +0000 Subject: [PATCH] Update files to remove when MK_ZFS=no. --- tools/build/mk/OptionalObsoleteFiles.inc | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8159e1fd02ab..01810689218d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -593,15 +593,31 @@ OLD_FILES+=usr/share/man/man1/dtrace.1.gz .endif .if ${MK_ZFS} == no -OLD_LIBS+=lib/libzfs.so.1 -OLD_LIBS+=lib/libzpool.so.1 +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_LIBS+=lib/libzfs.so.2 +OLD_LIBS+=lib/libzpool.so.2 +OLD_FILES+=rescue/zfs +OLD_FILES+=rescue/zpool OLD_FILES+=sbin/zfs OLD_FILES+=sbin/zpool +OLD_FILES+=usr/bin/zinject +OLD_FILES+=usr/bin/ztest OLD_FILES+=usr/lib/libzfs.a OLD_FILES+=usr/lib/libzfs.so +OLD_FILES+=usr/lib/libzfs_p.a OLD_FILES+=usr/lib/libzpool.a OLD_FILES+=usr/lib/libzpool.so -OLD_FILES+=usr/bin/ztest +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libzfs.a +OLD_FILES+=usr/lib32/libzfs.so +OLD_LIBS+=usr/lib32/libzfs.so.2 +OLD_FILES+=usr/lib32/libzfs_p.a +OLD_FILES+=usr/lib32/libzpool.a +OLD_FILES+=usr/lib32/libzpool.so +OLD_LIBS+=usr/lib32/libzpool.so.2 +.endif OLD_FILES+=usr/sbin/zdb OLD_FILES+=usr/share/man/man8/zdb.8.gz OLD_FILES+=usr/share/man/man8/zfs.8.gz