From: Rainer Orth Date: Thu, 13 Jun 2002 11:01:47 +0000 (+0000) Subject: * ltmain.in (irix, nonstopux): Set major before use. X-Git-Tag: release-1-5~106 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40bcc7f92c87d643652476a4eb0c4330a50ad0ca;p=thirdparty%2Flibtool.git * ltmain.in (irix, nonstopux): Set major before use. --- diff --git a/ChangeLog b/ChangeLog index 1ce63620d..3c73a18d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-06-13 Rainer Orth + + * ltmain.in (irix, nonstopux): Set major before use. + 2002-06-11 Daniel Kobras * libltdl/ltdl.c (try_dlopen): Don't return bogus handle to user diff --git a/ltmain.in b/ltmain.in index 90ce3789b..4b05385bf 100644 --- a/ltmain.in +++ b/ltmain.in @@ -69,17 +69,17 @@ rm="rm -f" # metacharacters that are still active within double-quoted strings. Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -# test EBCDIC or ASCII -case `echo A|od -x` in - *[Cc]1*) # EBCDIC based system - SP2NL="tr '\100' '\n'" - NL2SP="tr '\r\n' '\100\100'" - ;; - *) # Assume ASCII based system - SP2NL="tr '\040' '\012'" - NL2SP="tr '\015\012' '\040\040'" - ;; -esac +# test EBCDIC or ASCII +case `echo A|od -x` in + *[Cc]1*) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" + ;; + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" + ;; +esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. @@ -2658,14 +2658,14 @@ EOF ;; irix | nonstopux) + major=`expr $current - $age + 1` + case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac verstring="$verstring_prefix$major.$revision" - major=`expr $current - $age + 1` - # Add in all the interfaces that we are compatible with. loop=$revision while test "$loop" -ne 0; do