mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile.in: check JAVA_HOME/bin, not JAVA_HOME/include

Browse Source 
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
This commit is contained in:
Michael Stahl 2016-09-23 17:05:54 +02:00
parent 7ac64b9afa
commit fcdf75d946
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -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