From 0584ecaa55a4fe77c9768a5718ae69ec44d1f999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 24 Jun 2019 18:29:44 +0200
Subject: Fix the force_rebuilding_dep test

---
 core/deps.mk      | 2 +-
 test/core_deps.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/deps.mk b/core/deps.mk
index cdcf31f..2ecb0d2 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -130,7 +130,7 @@ ifneq ($(ALL_DEPS_DIRS),)
 			:; \
 		else \
 			echo $$dep >> $(ERLANG_MK_TMP)/deps.log; \
-			if [ -z "$(strip $(FULL))" ] $(if $(force_rebuilding_dep),&& ($(call force_rebuilding_dep,$$dep)),) && [ ! -L $$dep ] && [ -f $$dep/ebin/dep_built ]; then \
+			if [ -z "$(strip $(FULL))" ] $(if $(force_rebuilding_dep),&& ! ($(call force_rebuilding_dep,$$dep)),) && [ ! -L $$dep ] && [ -f $$dep/ebin/dep_built ]; then \
 				:; \
 			elif [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ]; then \
 				$(MAKE) -C $$dep IS_DEP=1; \
diff --git a/test/core_deps.mk b/test/core_deps.mk
index fd322fe..2736bc3 100644
--- a/test/core_deps.mk
+++ b/test/core_deps.mk
@@ -194,7 +194,7 @@ core-deps-dep-built-force-full: init
 	$i "Check that cowlib is not rebuilt if \`force_rebuilding_dep\` returns false"
 	$t touch $(APP)/EXPECT
 	$t $(SLEEP)
-	$t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) != $(APP)/deps/cowlib' $v
+	$t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) != $(CURDIR)/$(APP)/deps/cowlib' $v
 	$t find $(APP)/deps/cowlib -type f -newer $(APP)/EXPECT | sort | diff $(APP)/EXPECT -
 	$t rm $(APP)/EXPECT
 
@@ -205,7 +205,7 @@ core-deps-dep-built-force-full: init
 		$(APP)/deps/cowlib/ebin/cow_http.beam \
 		$(APP)/deps/cowlib/ebin/dep_built | sort > $(APP)/EXPECT
 	$t $(SLEEP)
-	$t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) = $(APP)/deps/cowlib' $v
+	$t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) = $(CURDIR)/$(APP)/deps/cowlib' $v
 # Files in .git might end up modified due to the id generation in the .app file.
 	$t find $(APP)/deps/cowlib -type f -newer $(APP)/EXPECT | grep -v ".git" | sort | diff $(APP)/EXPECT -
 	$t rm $(APP)/EXPECT
-- 
cgit v1.2.3