[Libreoffice-commits] core.git: Makefile.in

Stephan Bergmann sbergman at redhat.com
Wed Mar 27 03:17:39 PDT 2013


 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a21266f2233dc2cc6a69eed4afc0baf77c74e52f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 27 11:07:58 2013 +0100

    Use explicit "SHELL=/usr/bin/env bash" in Makefile.in after all
    
    ...instead of "SHELL=@BASH@" from d3f7d05d1b9bb29e168c49bda1e1a28734567993
    "Clean up OOO_SHELL" which could expand to SHELL=/bin/sh which, at least on
    Mac OS X 10.7 with /usr/bin/make 3.81, could apparently lead to recipe lines
    calling ooinstall being directly exec'ed from make and failing to find ooinstall
    in solenv/bin, instead of going via the shell and taking into account PATH from
    included config_host.mk.
    
    Change-Id: I841dc30f72d1d8841c64f48408a669eb6a37a1f3

diff --git a/Makefile.in b/Makefile.in
index 79740bb..626c726 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ ifeq ($(MAKECMDGOALS),)
 MAKECMDGOALS:=all
 endif
 
-SHELL=@BASH@
+SHELL=/usr/bin/env bash
 SRCDIR := @SRC_ROOT@
 BUILDDIR := @BUILDDIR@
 


More information about the Libreoffice-commits mailing list