From e75860815eae7bac42baaceff2dfe454718dded5 Mon Sep 17 00:00:00 2001 From: Gordon Matzigkeit Date: Thu, 3 Jul 1997 18:20:39 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 7 +++++++ demo/foo.c | 3 ++- demo/foo.h | 3 ++- demo/hello.c | 3 ++- demo/main.c | 3 ++- doc/libtool.texi | 4 ++-- ltmain.sh.in | 4 ++++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a643291f2..bd25fc295 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jul 2 19:13:00 1997 Gordon Matzigkeit + + * 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 * ltmain.sh.in, ltconfig.in: Eliminate uses of the NONE magic diff --git a/demo/foo.c b/demo/foo.c index ead1f8aa6..0a8c318ab 100644 --- 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 diff --git a/demo/foo.h b/demo/foo.h index e6d9cbe76..2a17a0ae3 100644 --- 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 a77bf8b99..b82bfe5ae 100644 --- 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 */ #include "foo.h" diff --git a/demo/main.c b/demo/main.c index 49487e955..169f7b2ae 100644 --- 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 */ #include "foo.h" diff --git a/doc/libtool.texi b/doc/libtool.texi index cfc9cc4d9..149b905d7 100644 --- 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 62b1d66e9..f56af4b5c 100644 --- 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 -- 2.47.2