From 62e80351e061a5be7bbe1261e8dea4a543b25e71 Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Fri, 22 Jun 2007 06:15:08 +0000 Subject: [PATCH] * ltmain.in (version-number) [irix]: Don't subtract 1 from major as it may be less than age. --- ChangeLog | 5 +++++ ltmain.in | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18f4e3634..b4e8dc496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-22 Peter O'Gorman + + * ltmain.in (version-number) [irix]: Don't subtract 1 from + major as it may be less than age. + 2007-06-17 Peter O'Gorman * libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): add quotes to diff --git a/ltmain.in b/ltmain.in index 9328f1560..5beacf68b 100644 --- a/ltmain.in +++ b/ltmain.in @@ -3239,9 +3239,10 @@ EOF age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; esac ;; @@ -3315,8 +3316,11 @@ EOF ;; irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; -- 2.47.3