*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index a643291f2eedac8292c46bee54ad87b3798ffb48..bd25fc295e8da5b1805b3a974cb9e68a905703d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul  2 19:13:00 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * ltmain.sh.in (link): In the executable wrapper, strip trailing
+       colons from the shlibpath_var because some ld.so's, notably
+       OpenBSD 2.0's (!), don't parse colon-terminated values correctly.
+       From Tim Pierce.
+
 Tue Jul  1 13:03:49 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * ltmain.sh.in, ltconfig.in: Eliminate uses of the NONE magic

diff --git a/demo/foo.c b/demo/foo.c
index ead1f8aa645b4141200d373f746d90cd03809bc1..0a8c318abaea62be37a8e7fd20d243c25abc52d7 100644 (file)
--- a/demo/foo.c
+++ b/demo/foo.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA. */
 
 #include "foo.h"
 #include <stdio.h>

diff --git a/demo/foo.h b/demo/foo.h
index e6d9cbe7630ab49ac9d1dce460fa3650f3f3e736..2a17a0ae3a3a000a1cdca12459d787c9e71c353f 100644 (file)
--- a/demo/foo.h
+++ b/demo/foo.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA. */
 
 /* Only include this header file once. */
 #ifndef _FOO_H_

diff --git a/demo/hello.c b/demo/hello.c
index a77bf8b992552522c94ed68b18a0e48fb2211647..b82bfe5ae753222f6bafe8a708eff9207096a808 100644 (file)
--- a/demo/hello.c
+++ b/demo/hello.c
@@ -14,7 +14,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA. */
 
 /* Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu> */
 #include "foo.h"

diff --git a/demo/main.c b/demo/main.c
index 49487e95587188476f5cea8f1c7d74ef3cdb0973..169f7b2aebe2c42d2d212952ea71fd9efcc7fefa 100644 (file)
--- a/demo/main.c
+++ b/demo/main.c
@@ -14,7 +14,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA. */
 
 /* Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu> */
 #include "foo.h"

diff --git a/doc/libtool.texi b/doc/libtool.texi
index cfc9cc4d9bcfeb3235ca4b2a14935b03c31f687a..149b905d79712c7c67ae84abeb9d7e76a99a642e 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -60,8 +60,8 @@ This is the first edition of the GNU Libtool documentation,@*
 and is consistent with GNU Libtool @value{VERSION}.@*
 @sp 2
 Published by the Free Software Foundation @*
-675 Massachusetts Avenue, @*
-Cambridge, MA 02139 USA @*
+59 Temple Place, Suite 330, @*
+Boston, MA 02111-1307 USA @*
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are

diff --git a/ltmain.sh.in b/ltmain.sh.in
index 62b1d66e986227b9b002e48bf2493be19f7323b2..f56af4b5c8c36ccc7b7209525dd52d0d29108eba 100644 (file)
--- a/ltmain.sh.in
+++ b/ltmain.sh.in
@@ -1018,6 +1018,10 @@ EOF
 
     # Add our own library path to $shlibpath_var
     $shlibpath_var="$temp_rpath\$$shlibpath_var"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    $shlibpath_var=\`echo \$$shlibpath_var | sed -e 's/:*\$//'\`
+
     export $shlibpath_var
 EOF
        fi