From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Mon, 24 Jul 2000 06:08:46 +0000 (+0000)
Subject: * ltmain.in (irix, major): Prepend a `.'.
X-Git-Tag: multi-language-merge-point~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc84ee446a5d0bd9c9e865cee4069ea88ac0cb8f;p=thirdparty%2Flibtool.git

* ltmain.in (irix, major): Prepend a `.'.
* ltconfig.in (irix, soname_spec, library_names_spec): Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index aecf4f5f1..0ae6a0ef8 100644
--- 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 f3e53fefd..7dc5aef00 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1057,8 +1057,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 ba17358e3..2522df7e4 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2385,7 +2385,6 @@ EOF
 
 	irix)
 	  major=`expr $current - $age + 1`
-	  versuffix="$major.$revision"
 	  verstring="sgi$major.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
@@ -2395,6 +2394,10 @@ EOF
 	    loop=`expr $loop - 1`
 	    verstring="sgi$major.$iface:$verstring"
 	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
 	  ;;
 
 	linux)