From 2373074a2ce9344e9fd058d76472e9aa85bbd4e8 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 23 Dec 2020 22:02:48 +0100 Subject: [PATCH] * builds/windows/detect.mk (COPY): Make it work with `shell`. Without this patch, we get the error builds/toplevel.mk:127: *** missing separator. Stop. Reported by Anuj, with a solution from Alexei. --- ChangeLog | 12 +++++++++++- builds/windows/detect.mk | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 116c52605..6cc94fdb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,16 @@ +2020-12-23 Werner Lemberg + + * builds/windows/detect.mk (COPY): Make it work with `shell`. + + Without this patch, we get the error + + builds/toplevel.mk:127: *** missing separator. Stop. + + Reported by Anuj, with a solution from Alexei. + 2020-12-23 Ignacio Casal Quinteiro - meson.build (ft2_defines): Fix builds on Windows. + * meson.build (ft2_defines): Fix builds on Windows. 2020-12-18 Tatsuyuki Ishi diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk index 303dc8b98..a079f9126 100644 --- a/builds/windows/detect.mk +++ b/builds/windows/detect.mk @@ -81,9 +81,9 @@ ifeq ($(PLATFORM),windows) # (2004-11-11), and then in the devel mailing list (2004-11-20 to -23). # ifeq ($(OS),Windows_NT) - COPY := cmd.exe /c copy + COPY := >nul cmd.exe /c copy else - COPY := copy + COPY := >nul copy endif # test NT