[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 bf0b2c7308ba8779ca671664fe72b6ac64d4f5fc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 30 12:48:09 2016 +0200

    Makefile: improve JAVA_HOME check
    
    On Fedora it often happens that the $JAVA_HOME directory is not actually
    deleted but contains a bunch of ".rpmnew" and ".rpmsave" files in
    jre/lib/security - so check that the "include" directory exists.
    
    Change-Id: I34bf945b346e79dbe6f1a6e96ba1ba5139ff8f13
    Reviewed-on: https://gerrit.libreoffice.org/28491
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 1ae5c5ea82207d90b556e8139ad48ca4ceff9311)
    Reviewed-on: https://gerrit.libreoffice.org/28496
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 9a83a0c..482fc50 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}"; then echo force-restart; fi)
+			if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/include"; then echo force-restart; fi)
 	sh -c $(SRCDIR)/autogen.sh
 
 else # MAKE_RESTARTS