rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
Werner Lemberg 2021-02-16 14:29:45 +01:00
parent 92bd99bd25
commit dfa7cca5f3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2021-02-16 Werner Lemberg <wl@gnu.org>
* 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 <wl@gnu.org>
Move 'dlg' submodule to `subprojects` directory.

12
builds/toplevel.mk
View File

@ -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