Kaydet (Commit) 1ae5c5ea authored tarafından Michael Stahl's avatar Michael Stahl

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/28491Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 4e8ff25f
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment