diff options
| author | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-26 14:52:45 +0000 |
|---|---|---|
| committer | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-26 14:52:45 +0000 |
| commit | 7baff5bd414eadc16381299fd5b92e422d3704d2 (patch) | |
| tree | cc5f3cd3039d161f8e2493d9fe94d1a75220c78b /libjava | |
| parent | a8cefe905b366aaa6b6af15a9f7124153ed18cf3 (diff) | |
| download | gcc-7baff5bd414eadc16381299fd5b92e422d3704d2.tar.gz | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/ltmain.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 2dc36c0e8b7..475e6bdc1b3 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 b01cb29a683..2d341c92aec 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 |