[SCM] GNU Libtool branch, master, updated. v2.2.6-154-g5a46d6e

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  5a46d6e5c1f3bf5165c45f903f39e00ccd2492a2 (commit)
      from  7890173078d185548f1f058322d8ddc3b18cfc81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5a46d6e5c1f3bf5165c45f903f39e00ccd2492a2
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 1 11:41:34 2009 +0100

    Fix func_normal_abspath sed script for Solaris.
    
    * libltdl/config/general.m4sh (pathcar, pathcdr, removedotparts)
    (collapseslashes, finalslash): Use single quotes, for clarity.
    (removedotparts): Avoid \{N,M\} after subexpression \(...\), for
    Solaris /bin/sed.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    6 ++++++
 libltdl/config/general.m4sh |   13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61bc746..caf125a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-01  Ralf Wildenhues  <address@hidden>
 
+       Fix func_normal_abspath sed script for Solaris.
+       * libltdl/config/general.m4sh (pathcar, pathcdr, removedotparts)
+       (collapseslashes, finalslash): Use single quotes, for clarity.
+       (removedotparts): Avoid \{N,M\} after subexpression \(...\), for
+       Solaris /bin/sed.
+
        Improve versioning algorithm documentation.
        * doc/libtool.texi (Updating version info): Repeat the
        algorithms in different, hopefully simpler terms.
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 53fafba..fcf75e9 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -101,11 +101,14 @@ func_dirname_and_basename ()
 # Generated shell functions inserted here.
 
 # These SED scripts presuppose an absolute path with a trailing slash.
-pathcar="s,^/\([^/]*\).*$,\1,"
-pathcdr="s,^/[^/]*,,"
-removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
-collapseslashes="s@/\{1,\}@/@g"
-finalslash="s,/*$,/,"
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+               s@/\./@/@g
+               t dotsl
+               s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
 
 # func_normal_abspath PATH
 # Remove doubled-up and trailing slashes, "." path components,


hooks/post-receive
-- 
GNU Libtool