[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - Makefile.in

Jan-Marek Glogowski glogow at fbihome.de
Wed Aug 3 11:31:41 UTC 2016


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

New commits:
commit 5b6e5008207d30afba0d797bba774538744e786e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sun Jul 31 13:06:18 2016 +0200

    Use "dot" for "source"ing shell files
    
    Quote from stackoverflow: "source" is non-standard and specifically
    not supported in ash, dash or pdksh... it's a Bashism.
    
    Change-Id: I4b47385c1e44c5e56bd84f23ff3645712015dcf4
    Reviewed-on: https://gerrit.libreoffice.org/27746
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 3e241399476ca3c2e3775f485356197bb93863a9)
    Reviewed-on: https://gerrit.libreoffice.org/27751
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 0bbc1b4..9a83a0c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
 		$(BUILDDIR)/autogen.lastrun \
 		$(BUILDDIR)/autogen.sh \
 		) \
-		$(shell source $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
+		$(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
 			if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}"; then echo force-restart; fi)
 	sh -c $(SRCDIR)/autogen.sh
 


More information about the Libreoffice-commits mailing list