Fix Savannah bug #44261.

* builds/unix/detect.mk (setup) [unix]: Set `CONFIG_SHELL' in the environment also while calling the configure script.
10 years ago · 0814b80fde
parent 587351b7e2
commit 0814b80fde
2 changed files with 12 additions and 2 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2015-02-16  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #44261.
+
+	* builds/unix/detect.mk (setup) [unix]: Set `CONFIG_SHELL' in the
+	environment also while calling the configure script.
+
 2015-02-16  Werner Lemberg  <wl@gnu.org>

 	* include/internal/ftmemory.h: Add some `FT_Offset' casts.
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@ -81,9 +81,12 @@ ifeq ($(PLATFORM),unix)
  ifdef must_configure
    ifneq ($(have_Makefile),)
      # we are building FT2 not in the src tree
-	      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+	      CONFIG_SHELL="$(CONFIG_SHELL)" \
+	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
    else
-	      cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
+	      cd builds/unix; \
+	      CONFIG_SHELL="$(CONFIG_SHELL)" \
+	        $(CONFIG_SHELL) ./configure $(value CFG)
    endif
  endif