From a4d8c9414e65271fc97347ae04b0b431206d33f8 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Tue, 25 Feb 2020 13:53:03 +0100
Subject: Makefile in test-suite: More separation of concerns as suggested by
 Enrico.

See "https://github.com/coq/coq/pull/10008#discussion_r382899607".
---
 test-suite/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test-suite/Makefile b/test-suite/Makefile
index 6a6b729578..1681150f7b 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -32,11 +32,15 @@ include ../Makefile.common
 # Variables
 #######################################################################
 
+# Using quotes to anticipate the possibility of spaces in the directory name
+# Note that this will later need an eval in shell to interpret the quotes
+ROOT='$(shell cd ..; pwd)'
+
 ifneq ($(wildcard ../_build),)
-BIN:='$(shell cd ..; pwd)'/_build/install/default/bin/
-COQLIB:='$(shell cd ..; pwd)'/_build/install/default/lib/coq
+BIN:=$(ROOT)/_build/install/default/bin/
+COQLIB:=$(ROOT)/_build/install/default/lib/coq
 else
-BIN := '$(shell cd ..; pwd)'/bin/
+BIN := $(ROOT)/bin/
 
 COQLIB?=
 ifeq ($(COQLIB),)
-- 
cgit v1.2.3