aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorDave Korn <dave.korn.cygwin@gmail.com>2009-08-26 14:52:45 +0000
committerDave Korn <davek@gcc.gnu.org>2009-08-26 14:52:45 +0000
commit68ccd57c8c3c04c56136779c4287d33afb1ccd1b (patch)
treecc5f3cd3039d161f8e2493d9fe94d1a75220c78b /libjava
parent6b8b9e4262617040a6879600a8e411f95ec30b1b (diff)
downloadgcc-68ccd57c8c3c04c56136779c4287d33afb1ccd1b.zip
gcc-68ccd57c8c3c04c56136779c4287d33afb1ccd1b.tar.gz
gcc-68ccd57c8c3c04c56136779c4287d33afb1ccd1b.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/ltmain.sh4
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 2dc36c0..475e6bd 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 b01cb29..2d341c9 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