shell_cmds-216.60.1.tar.gz

[apple/shell_cmds.git] / sh / Makefile

diff --git a/sh/Makefile b/sh/Makefile
index 08fa278910d0b08be258ecbf7049548859dd475e..8d0866256fe1dee009f28242ddb44b51cf01057f 100644 (file)
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,5 +1,5 @@
 #      @(#)Makefile    8.4 (Berkeley) 5/5/95
-# $FreeBSD: head/bin/sh/Makefile 301285 2016-06-03 19:25:41Z bdrewery $
+# $FreeBSD: head/bin/sh/Makefile 322515 2017-08-14 19:21:37Z ngie $
 
 .include <src.opts.mk>
 
@@ -28,9 +28,9 @@ WARNS?=       2
 WFORMAT=0
 
 .PATH: ${.CURDIR}/bltin \
-       ${.CURDIR}/../kill \
-       ${.CURDIR}/../test \
-       ${.CURDIR}/../../usr.bin/printf
+       ${.CURDIR:H}/kill \
+       ${.CURDIR:H}/test \
+       ${SRCTOP}/usr.bin/printf
 
 CLEANFILES+= mknodes mknodes.o \
        mksyntax mksyntax.o
@@ -64,8 +64,7 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
        sh ${.CURDIR}/mktokens
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>