diff options
| author |   Christoph Willing | 2019-06-08 15:03:08 +0200 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2019-06-09 00:33:19 +0200 |
| commit | 6f2f6d7cca61d6dccb7451829115bb9125c742af (patch) | |
| tree | 9225efabe1bd68086837819ec27408f1f3d71121 /office/LibreOffice/LibreOffice.SlackBuild | |
| parent | ac6a2f66e3136d35cbd3e6c71ccdcbfa5c32a380 (diff) | |
| download | slackbuilds-6f2f6d7cca61d6dccb7451829115bb9125c742af.tar.gz | |
office/LibreOffice: Accommodate renaming openjdk to openjdk7
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 6ce5c43442..071eadea37 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -91,9 +91,9 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true # If PARALLEL environment variable is set, use that to override everything. [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL" -JAVA=${JAVA:-openjdk} -if [ "$JAVA" = "openjdk" ]; then - . /etc/profile.d/openjdk.sh +JAVA=${JAVA:-openjdk7} +if [ "$JAVA" = "openjdk7" ]; then + . /etc/profile.d/openjdk7.sh use_java="--with-java=java" elif [ "$JAVA" = "openjdk8" ]; then . /etc/profile.d/openjdk8.sh |