From 313384fdfe2ad4434e8b4332824863ba1e2fea8c Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Tue, 6 May 2014 22:30:19 +0200 Subject: [PATCH] Fix dependency checking with bmake gmake always includes files relative to the current directory, while bmake includes them relative to the current Makefile - and current Makefile means the current include. However, bmake has a variable .CURDIR that always points to the current directory, but is missing in gmake. Thus, .CURDIR is just set to "." if it's not set and always in the include, thus making it work with both, bmake and gmake. --- buildsys.mk.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildsys.mk.in b/buildsys.mk.in index b686ca3..75fcd00 100644 --- a/buildsys.mk.in +++ b/buildsys.mk.in @@ -797,4 +797,5 @@ INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_ DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err -include .deps +.CURDIR ?= . +include ${.CURDIR}/.deps