diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-08-30 12:48:09 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-30 14:13:45 +0000 |
| commit | bf0b2c7308ba8779ca671664fe72b6ac64d4f5fc (patch) | |
| tree | 8d76c7d22ac6e04867443bd106e729fd3036621f /Makefile.in | |
| parent | add9d233307d747650a786495713f0c05e91883b (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>
(cherry picked from commit 1ae5c5ea82207d90b556e8139ad48ca4ceff9311)
Reviewed-on: https://gerrit.libreoffice.org/28496
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@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 9a83a0cc6bf2..482fc5065535 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 |