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

10 years ago · d0d7ee047b
parent 14d6b5d748
commit d0d7ee047b
2 changed files with 6 additions and 5 deletions
--- a/4
+++ b/4
@ -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>

 	[truetype] Introduce named instance access to GX fonts.
--- 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