From 7b5db6f40871eb7581bc4950405a68cdc54e3b61 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 17 Dec 2018 10:49:10 +0000 Subject: openjdk: correctly determine version and build numbers from the source --- openjdk/build/openjdk.SlackBuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openjdk/build/openjdk.SlackBuild') diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index 4930f8f0..4370a218 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -126,8 +126,8 @@ find . \ -exec chmod 644 {} \; # First check: are our sources complying with our SlackBuild? -JDKU=$(cat Makefile.in | grep ^JDK_UPDATE_VERSION | tr -d ' ' | cut -f2 -d=) -JDKB=$(cat Makefile.in | grep ^BUILD_VERSION | tr -d ' ' | cut -f2 -d=) +JDKU=$(cat acinclude.m4 | grep "^ *JDK_UPDATE_VERSION" | tr -d ' ' | cut -f2 -d=) +JDKB=$(cat acinclude.m4 | grep "^ *BUILD_VERSION" | tr -d ' ' | cut -f2 -d=) echo "** This SlackBuild creates a package for Java $JAVAVER using OpenJDK build $JAVABLD" echo "** The script uses icedtea-$ICEDTEA as a build framework." echo "** Icedtea will (download and) build Java update $JDKU using OpenJDK build $JDKB" -- cgit v1.2.3-65-gdbad