529 else |
529 else |
530 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" |
530 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" |
531 fi |
531 fi |
532 AC_SUBST(JDK_VERSION) |
532 AC_SUBST(JDK_VERSION) |
533 |
533 |
|
534 # The cooked update version used to encode trailing letters in the update |
|
535 # version into a trailing number. That is no longer needed, but need to |
|
536 # keep the format in 8u for compatibility. |
|
537 COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" |
|
538 AC_SUBST(COOKED_JDK_UPDATE_VERSION) |
|
539 |
534 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` |
540 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` |
535 AC_SUBST(COOKED_BUILD_NUMBER) |
541 AC_SUBST(COOKED_BUILD_NUMBER) |
536 ]) |
542 ]) |
537 |
543 |
538 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], |
544 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], |