diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-12-17 10:49:10 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-12-17 10:49:10 +0000 |
| commit | 7b5db6f40871eb7581bc4950405a68cdc54e3b61 (patch) | |
| tree | 4ee7b6a8822519d7e410007fcfd203c37951688f /openjdk | |
| parent | 45a64cc07a4efe259c6eacc93bec38b1279526f8 (diff) | |
| download | asb-7b5db6f40871eb7581bc4950405a68cdc54e3b61.tar.gz asb-7b5db6f40871eb7581bc4950405a68cdc54e3b61.tar.xz | |
openjdk: correctly determine version and build numbers from the source
Diffstat (limited to 'openjdk')
| -rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 4 |
1 files changed, 2 insertions, 2 deletions
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" |