From e0a8a2be26f0f894cea6ab5f8d06b5449a6a5078 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Tue, 1 Nov 2016 12:39:54 +0000 Subject: [PATCH] make: Fixing issue with finding changed files --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bff35124..96c84855 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,8 @@ $(SUBDIRS_TARGETS): $(MAKE) --no-print-directory -C $(@D) $(@F:.%=%) DIFF := $(lastword $(subst /, ,${CIRCLE_COMPARE_URL})) -CHANGES := $(filter $(dir $(shell git diff --name-only $(DIFF))), $(SUBDIRS)) +CHANGED_FILES := $(subst /, , $(dir $(shell git diff --name-only $(DIFF)))) +CHANGES := $(patsubst %, %/, $(sort $(filter $(subst /, ,$(SUBDIRS)), $(CHANGED_FILES)))) .PHONY: diff diff: echo $(CHANGES)