[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master d0d7ee0: * builds/unix/detect.mk (CONFIG_SHELL): Don'
From: |
Werner LEMBERG |
Subject: |
[freetype2] master d0d7ee0: * builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261). |
Date: |
Fri, 14 Aug 2015 12:31:11 +0000 |
branch: master
commit d0d7ee047b68d7417deef0b1616c3c949ea8a28e
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* 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 f5094ae..ea323f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-14 Andreas Enge <address@hidden>
+
+ * builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261).
+
2015-08-13 Werner Lemberg <address@hidden>
[truetype] Introduce named instance access to GX fonts.
diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk
index ef007bf..025ed49 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master d0d7ee0: * builds/unix/detect.mk (CONFIG_SHELL): Don't handle it (#44261).,
Werner LEMBERG <=