ChangeLog:

	* ltmain.sh (removedotparts): Don't use comma as 's' separator.
	(collapseslashes): Likewise.

libjava/classpath/ChangeLog:

	* ltmain.sh (removedotparts): Don't use comma as 's' separator.
	(collapseslashes): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151124 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 3ebf939912325a40692e064a170308c40e470718..307b946a71db3aefae96e77f12af01eaf1f270e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-26  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * ltmain.sh (removedotparts): Don't use comma as 's' separator.
+       (collapseslashes): Likewise.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (AC_PREREQ): Bump to 2.64.

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 2dc36c0e8b7172df0989a28ce34250f17baaeaf7..475e6bdc1b3f27ede53a5c483b5a461dc2fd08a5 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-26  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * ltmain.sh (removedotparts): Don't use comma as 's' separator.
+       (collapseslashes): Likewise.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (AC_PREREQ): Bump to 2.64.

diff --git a/libjava/classpath/ltmain.sh b/libjava/classpath/ltmain.sh
index b01cb29a683b675b17f86b02172761c8e2a94a89..2d341c92aec8901e83ee84d1108c36900710e390 100644 (file)
--- a/libjava/classpath/ltmain.sh
+++ b/libjava/classpath/ltmain.sh
@@ -173,8 +173,8 @@ func_dirname_and_basename ()
 # 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"
+removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
+collapseslashes="s@/\{1,\}@/@g"
 finalslash="s,/*$,/,"
 
 # func_normal_abspath PATH

diff --git a/ltmain.sh b/ltmain.sh
index b01cb29a683b675b17f86b02172761c8e2a94a89..2d341c92aec8901e83ee84d1108c36900710e390 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -173,8 +173,8 @@ func_dirname_and_basename ()
 # 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"
+removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
+collapseslashes="s@/\{1,\}@/@g"
 finalslash="s,/*$,/,"
 
 # func_normal_abspath PATH