From dfa7cca5f3b4f494aae785891ab4a42e66db77ef Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 16 Feb 2021 14:29:45 +0100 Subject: [PATCH] * builds/toplevel.mk: Avoid side effects of `shell`. We use a dummy variable to catch its output. Otherwise the `make` program is going to interpret the return value of `shell`; this can cause obscure warning or error messages or even be harmful. --- ChangeLog | 8 ++++++++ builds/toplevel.mk | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c228ff22..a191af705 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-02-16 Werner Lemberg + + * builds/toplevel.mk: Avoid side effects of `shell`. + + We use a dummy variable to catch its output. Otherwise the `make` + program is going to interpret the return value of `shell`; this can + cause obscure warning or error messages or even be harmful. + 2021-02-16 Werner Lemberg Move 'dlg' submodule to `subprojects` directory. diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 08170bbef..e9cb62d35 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -118,17 +118,17 @@ ifdef check_platform ifeq ($(wildcard src/dlg/dlg.*),) ifeq ($(wildcard subprojects/dlg/*),) $(info Checking out submodule in `subprojects/dlg') - $(shell git submodule init) - $(shell git submodule update) + dummy := $(shell git submodule init) + dummy := $(shell git submodule update) endif $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg') - $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)) - $(shell $(COPY) \ + dummy := $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)) + dummy := $(shell $(COPY) \ $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)) - $(shell $(COPY) \ + dummy := $(shell $(COPY) \ $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)) - $(shell $(COPY) \ + dummy := $(shell $(COPY) \ $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)) endif