[src/trunk]: src/usr.sbin/fstyp Use CPPFLAGS for -D and -I so that lint works.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/559b7e770505
branches:  trunk
changeset: 986281:559b7e770505
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 17 14:48:31 2021 +0000

description:
Use CPPFLAGS for -D and -I so that lint works.

diffstat:

 usr.sbin/fstyp/Makefile |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (40 lines):

diff -r 780ae2619fe7 -r 559b7e770505 usr.sbin/fstyp/Makefile
--- a/usr.sbin/fstyp/Makefile   Fri Sep 17 14:09:00 2021 +0000
+++ b/usr.sbin/fstyp/Makefile   Fri Sep 17 14:48:31 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2021/02/02 21:31:11 joerg Exp $
+#      $NetBSD: Makefile,v 1.12 2021/09/17 14:48:31 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -14,19 +14,21 @@
 WARNS?=        6
 
 .if (${MKZFS} != "no")
-CFLAGS+=       -DHAVE_ZFS
 COPTS.zfs.c+=  -Wno-unknown-pragmas
 COPTS.zfs.c+=  -Wno-sign-conversion
 COPTS.zfs.c+=  -Wno-strict-prototypes
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/include
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/sys
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/dist/head
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libzpool/common
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/fs/zfs
-COPTS.zfs.c+=  -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libnvpair
 LDADD+=        -lnvpair -lzfs
+
+OSNET=${NETBSDSRCDIR}/external/cddl/osnet
+CPPFLAGS+=     -DHAVE_ZFS
+CPPFLAGS.zfs.c+=       -I${NETBSDSRCDIR}/external
+CPPFLAGS.zfs.c+=       -I${OSNET}/include
+CPPFLAGS.zfs.c+=       -I${OSNET}/sys
+CPPFLAGS.zfs.c+=       -I${OSNET}/dist/head
+CPPFLAGS.zfs.c+=       -I${OSNET}/dist/lib/libzpool/common
+CPPFLAGS.zfs.c+=       -I${OSNET}/dist/uts/common
+CPPFLAGS.zfs.c+=       -I${OSNET}/dist/uts/common/fs/zfs
+CPPFLAGS.zfs.c+=       -I${OSNET}/dist/lib/libnvpair
 .endif
 
 CWARNFLAGS.clang+=     -Wno-unknown-pragmas -Wno-error=address-of-packed-member