Index: stable/11/tools/tools/zfsboottest/Makefile =================================================================== --- stable/11/tools/tools/zfsboottest/Makefile (revision 322106) +++ stable/11/tools/tools/zfsboottest/Makefile (revision 322107) @@ -1,29 +1,29 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../sys/boot/zfs ${.CURDIR}/../../../sys/cddl/boot/zfs +.PATH: ${SRCTOP}/sys/boot/zfs ${SRCTOP}/sys/cddl/boot/zfs BINDIR?= /usr/bin SCRIPTSDIR?= /usr/bin PROG= zfsboottest SCRIPTS= zfsboottest.sh SCRIPTSNAME= zfsboottest.sh MAN= CFLAGS= -O1 \ - -I${.CURDIR}/../../../sys/boot/zfs \ - -I${.CURDIR}/../../../sys/cddl/boot/zfs \ + -I${SRCTOP}/sys/boot/zfs \ + -I${SRCTOP}/sys/cddl/boot/zfs \ -I. \ -fdiagnostics-show-option \ -W -Wextra -Wno-sign-compare -Wno-unused-parameter CFLAGS+=-m32 LIBADD+= md .if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboottest.o: machine CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../sys/i386/include machine + ln -sf ${SRCTOP}/sys/i386/include machine .endif .include Index: stable/11 =================================================================== --- stable/11 (revision 322106) +++ stable/11 (revision 322107) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r321845