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

* builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261).

This commit is contained in:
Werner Lemberg 2015-08-14 14:30:58 +02:00
parent 14d6b5d748
commit d0d7ee047b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2015-08-14 Andreas Enge <andreas.enge@inria.fr>
* builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261).
2015-08-13 Werner Lemberg <wl@gnu.org> 2015-08-13 Werner Lemberg <wl@gnu.org>
[truetype] Introduce named instance access to GX fonts. [truetype] Introduce named instance access to GX fonts.

7
builds/unix/detect.mk
View File

@ -76,17 +76,14 @@ ifeq ($(PLATFORM),unix)
have_Makefile := $(wildcard $(OBJ_DIR)/Makefile) have_Makefile := $(wildcard $(OBJ_DIR)/Makefile)
CONFIG_SHELL ?= /bin/sh
setup: std_setup setup: std_setup
ifdef must_configure ifdef must_configure
ifneq ($(have_Makefile),) ifneq ($(have_Makefile),)
# we are building FT2 not in the src tree # we are building FT2 not in the src tree
CONFIG_SHELL="$(CONFIG_SHELL)" \ $(TOP_DIR)/builds/unix/configure $(value CFG)
$(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
else else
cd builds/unix; \ cd builds/unix; \
CONFIG_SHELL="$(CONFIG_SHELL)" \ ./configure $(value CFG)
$(CONFIG_SHELL) ./configure $(value CFG)
endif endif
endif endif