* ltmain.in (irix, major): Prepend a `.'.

* ltconfig.in (irix, soname_spec, library_names_spec): Adjust.

diff --git a/ChangeLog b/ChangeLog
index e426c88f633fb64c1a37ac3debc30ea3d1a43d64..560a94793643b347d1548bd8df08b3730ef3c816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-24  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>, David Kaelbling  <drk@orchietta.hudson.sgi.com>
+
+       * ltmain.in (irix, major): Prepend a `.'.
+       * ltconfig.in (irix, soname_spec, library_names_spec): Adjust.
+
 2000-07-24  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>, Ralf S. Engelschall  <rse@engelschall.com>
 
        * ltmain.in: Support GNU shtool's install.

diff --git a/ltconfig.in b/ltconfig.in
index 9172e9944deb889e723d226e7f3cb37711d6858c..54aa90f1c9ab63fbcafc540def306989a8095ed2 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1958,8 +1958,8 @@ irix5* | irix6*)
   version_type=irix
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so.$major'
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
   case "$host_os" in
   irix5*)
     libsuff= shlibsuff=

diff --git a/ltmain.in b/ltmain.in
index 946e26cb15d0da07e69a904888ccd514df9c98a8..20009201df581f77ec8d5103a419cab0acb97267 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1697,7 +1697,6 @@ compiler."
 
        irix)
          major=`expr $current - $age + 1`
-         versuffix="$major.$revision"
          verstring="sgi$major.$revision"
 
          # Add in all the interfaces that we are compatible with.
@@ -1707,6 +1706,10 @@ compiler."
            loop=`expr $loop - 1`
            verstring="sgi$major.$iface:$verstring"
          done
+
+         # Before this point, $major must not contain `.'.
+         major=.$major
+         versuffix="$major.$revision"
          ;;
 
        linux)