diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/ltmain.sh | 4 | ||||
| -rw-r--r-- | ltmain.sh | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3ebf9399123..307b946a71d 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 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 diff --git a/ltmain.sh b/ltmain.sh index b01cb29a683..2d341c92aec 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 |