From: Dave Korn <dave.korn.cygwin@gmail.com>
Date: Wed, 26 Aug 2009 14:52:45 +0000 (+0000)
Subject: ltmain.sh (removedotparts): Don't use comma as 's' separator.
X-Git-Tag: releases/gcc-4.5.0~3832
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68ccd57c8c3c04c56136779c4287d33afb1ccd1b;p=thirdparty%2Fgcc.git

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

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.

From-SVN: r151124
---

diff --git a/ChangeLog b/ChangeLog
index 3ebf93991232..307b946a71db 100644
--- 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 2dc36c0e8b71..475e6bdc1b3f 100644
--- 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 b01cb29a683b..2d341c92aec8 100644
--- 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 b01cb29a683b..2d341c92aec8 100644
--- 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