From d0d7ee047b68d7417deef0b1616c3c949ea8a28e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 14 Aug 2015 14:30:58 +0200 Subject: [PATCH] * builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261). --- ChangeLog | 4 ++++ builds/unix/detect.mk | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5094ae2d..ea323f3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-08-14 Andreas Enge + + * builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261). + 2015-08-13 Werner Lemberg [truetype] Introduce named instance access to GX fonts. diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index ef007bf39..025ed491d 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -76,17 +76,14 @@ ifeq ($(PLATFORM),unix) have_Makefile := $(wildcard $(OBJ_DIR)/Makefile) - CONFIG_SHELL ?= /bin/sh setup: std_setup ifdef must_configure ifneq ($(have_Makefile),) # we are building FT2 not in the src tree - CONFIG_SHELL="$(CONFIG_SHELL)" \ - $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG) + $(TOP_DIR)/builds/unix/configure $(value CFG) else cd builds/unix; \ - CONFIG_SHELL="$(CONFIG_SHELL)" \ - $(CONFIG_SHELL) ./configure $(value CFG) + ./configure $(value CFG) endif endif