diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-08-30 12:48:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-30 12:53:54 +0000 |
| commit | 1ae5c5ea82207d90b556e8139ad48ca4ceff9311 (patch) | |
| tree | d99c5637f248723ae79c17658fdc43c23ae57ff5 /Makefile.in | |
| parent | 4e8ff25ff73c0175fb51d11eb4ca7157a3789e97 (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index a27d55d7858e..2fcf673a8290 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 |