diff options
| author | jlam <jlam> | 2003-08-16 11:13:25 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-16 11:13:25 +0000 |
| commit | ff85d56286eb4e73e9e5a5fb7a7d1765ff69117b (patch) | |
| tree | 8bf693afcde57b25a7d2e459e1f62187c07ee207 /mk/buildlink3/libtool-fix-la | |
| parent | 5d63c4b71ddb91db88cfc3f58ca56e5f36695412 (diff) | |
| download | pkgsrc-ff85d56286eb4e73e9e5a5fb7a7d1765ff69117b.tar.gz | |
We need to match the next directory part of ${DEPOTBASE}/* when we're
replacing with ${LOCALBASE}, otherwise we're not matching the full depot
directory.
Diffstat (limited to 'mk/buildlink3/libtool-fix-la')
| -rw-r--r-- | mk/buildlink3/libtool-fix-la | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/buildlink3/libtool-fix-la b/mk/buildlink3/libtool-fix-la index 053d42be88f..9e3751fbbc7 100644 --- a/mk/buildlink3/libtool-fix-la +++ b/mk/buildlink3/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.1.2.3 2003/08/16 11:05:36 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.1.2.4 2003/08/16 11:13:25 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -189,7 +189,7 @@ if $test -f $lafile; then -L@WRKSRC@/*) ;; -L@DEPOTBASE@/*) - i=`$echo "X$i" | $Xsed -e "s,-L@DEPOTBASE@,-L@LOCALBASE@,"` + i=`$echo "X$i" | $Xsed -e "s,-L@DEPOTBASE@/[^/]*/,-L@LOCALBASE@/,"` case "$L" in *"$i "*) ;; *"$i") ;; @@ -223,7 +223,7 @@ if $test -f $lafile; then # *.la) dirbase=`@DIRNAME@ $i` - dir=`$echo "X$dirbase" | $Xsed -e "s,^@DEPOTBASE@/,@LOCALBASE@/,"` + dir=`$echo "X$dirbase" | $Xsed -e "s,^@DEPOTBASE@/[^/]*/,@LOCALBASE@/,"` case "$L" in *"-L$dir "*) ;; *"-L$dir") ;; |