From 3db89b525e9bf920cfc9f8918bafccba9342308e Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 27 Oct 2012 18:06:03 +0200 Subject: [PATCH] bmake: rethink default mk search path again Talking with swildner, we don't want the magic token to come before /usr/share/mk because that would case the host make (after bootstrapping) to seek files /usr/src/share/mk rather than the world mk files. Also, it appears that the magic token won't even help with pkgsrc support the mk files are in another branch (e.g. /usr/pkg/share/mk when the token would look in /usr/pkgsrc/share/mk). We really don't have a use for .../share/mk, but putting it after /usr/share/mk won't hurt anything. Leave .../share/mk in place just in case it becomes a useful capability later. --- usr.bin/bmake/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 4b0f659d0d..4d8b233e07 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -25,7 +25,7 @@ MAKE_VERSION= 20121010 .if defined(BOOTSTRAPPING) DEFAULT_SYS_PATH = ${.CURDIR}/../../share/mk .else -DEFAULT_SYS_PATH = .../share/mk:/usr/share/mk +DEFAULT_SYS_PATH = /usr/share/mk:.../share/mk .endif WARNS?= 4 -- 2.41.0