aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Tassi2019-01-25 22:37:57 +0100
committerEnrico Tassi2019-01-25 22:37:57 +0100
commit4b006833d6f866a33024e674d300f74592d24622 (patch)
treeeba3c36d343766700496cfd4ce74584d2f78cf96
parent07be5ac6dcbaeb7dac4c38d6146d41d96e96da59 (diff)
parentdddfb9f99218dcc140c1a2904b0c8d0f11d9a279 (diff)
Merge PR #9362: Fix makefile .merlin for unit tests
Reviewed-by: gares
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
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