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

[Michael Stahl]

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

New commits:
commit c8c8a1f916b1bc57ef5f0d3b70dac700578269ff
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 23 17:05:54 2016 +0200

    Makefile.in: check JAVA_HOME/bin, not JAVA_HOME/include
    
    On Mac OS X 10.8, the directory contains "bin" but not "include", so it
    re-runs autogen.sh all the time.
    JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
    
    Change-Id: I9065c8daef47df535f60267fc2c3e7cb23fc3910
    (cherry picked from commit fcdf75d9460c933670a03b5d88de17838db23ee2)
    Reviewed-on: https://gerrit.libreoffice.org/29239
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/Makefile.in b/Makefile.in
index 482fc50..f1bd93b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
 		$(BUILDDIR)/autogen.sh \
 		) \
 		$(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
-			if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/include"; then echo force-restart; fi)
+			if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/bin"; then echo force-restart; fi)
 	sh -c $(SRCDIR)/autogen.sh
 
 else # MAKE_RESTARTS