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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 61bc746bdbae0fe643fdca26d0f0f27d7775cd6a..caf125a5a100088a7cd146e2e3bcbb00c0717ed5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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 53fafbadf469c20cb7ab35e931b911a800ad73d9..fcf75e945d723ce8a17bb9e38d0b9d457f124bbe 100644 (file)
--- 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,