From 7baff5bd414eadc16381299fd5b92e422d3704d2 Mon Sep 17 00:00:00 2001
From: davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 26 Aug 2009 14:52:45 +0000
Subject: [PATCH] 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
---
ChangeLog | 5 +++++
libjava/classpath/ChangeLog | 5 +++++
libjava/classpath/ltmain.sh | 4 ++--
ltmain.sh | 4 ++--
4 files changed, 14 insertions(+), 4 deletions(-)
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
--
GitLab