Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c8c8a1f916b1bc57ef5f0d3b70dac700578269ff
Author: Michael Stahl <[email protected]>
Date: Fri Sep 23 17:05:54 2016 +0200
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 <[email protected]>
Reviewed-by: Noel Grandin <[email protected]>
Reviewed-by: Christian Lohmaier <[email protected]>
diff --git a/Makefile.in b/Makefile.in
index 482fc50..f1bd93b 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
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
