diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-23 17:05:54 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-09-26 12:20:27 +0000 |
| commit | c8c8a1f916b1bc57ef5f0d3b70dac700578269ff (patch) | |
| tree | aa78567a0c0aea9a00c08c109a2a0f14b821e4fc /Makefile.in | |
| parent | f94c217c29cdd347b56314a51cbbf795ec6517be (diff) | |
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@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.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 482fc5065535..f1bd93b4b72f 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 |