From dddfb9f99218dcc140c1a2904b0c8d0f11d9a279 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Sat, 19 Jan 2019 22:36:07 +0000
Subject: Fix makefile .merlin for unit tests

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 99d4611dce..03cb51e6a3 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,8 @@ export MLPACKFILES := $(call find, '*.mlpack')
 export MLGFILES := $(call find, '*.mlg')
 export CFILES := $(call findindir, 'kernel/byterun', '*.c')
 
-MERLININFILES := $(call find, '.merlin.in')
+# NB our find wrapper ignores the test suite
+MERLININFILES := $(call find, '.merlin.in') test-suite/unit-tests/.merlin.in
 export MERLINFILES := $(MERLININFILES:.in=)
 
 # NB: The lists of currently existing .ml and .mli files will change
-- 
cgit v1.2.3