From 8a3be4eaea6d2a42a8a6fd82fec655e0815f0cf0 Mon Sep 17 00:00:00 2001 From: Julien Fischer Date: Fri, 7 Apr 2023 19:14:34 +1000 Subject: [PATCH] Avoid a warning from make on Windows. scripts/Mmake.vars.in: The cygpath utility prints a warning if it is invoked with an empty argument. --- scripts/Mmake.vars.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in index ca73c7078..74694f7b5 100644 --- a/scripts/Mmake.vars.in +++ b/scripts/Mmake.vars.in @@ -50,7 +50,13 @@ endif # occurrence of $(patsubst ...), since GNU Make does not respect quotes. UNIX_MERCURY_EXTRA_INT_DIRS = $(foreach dir, $(MERCURY_EXTRA_INT_DIRS),\ $(shell @CYGPATHU@ "$(dir)")) -UNIX_MERC_INT_DIR = $(shell @CYGPATHU@ "$(MERC_INT_DIR)") + +ifdef MERC_INT_DIR + UNIX_MERC_INT_DIR = $(shell @CYGPATHU@ "$(MERC_INT_DIR)") +else + UNIX_MERC_INT_DIR = +endif + UNIX_MERCURY_EXTRA_INIT_DIRS = $(foreach dir, $(MERCURY_EXTRA_INIT_DIRS),\ $(shell @CYGPATHU@ "$(dir)"))