diff options
| author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 08:58:15 +0000 |
|---|---|---|
| committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 08:58:15 +0000 |
| commit | d7a25e7413231bfc5e6bce49a803344138c44073 (patch) | |
| tree | a322b814d3e5af230ad9ac5813f99194015ffd05 /libjava | |
| parent | 532691cbf32df968dc34e6f6c4f5be27940f5cb4 (diff) | |
| download | gcc-d7a25e7413231bfc5e6bce49a803344138c44073.tar.gz | |
2008-07-16 Roger Sayle <roger@eyesopen.com>
Paolo Bonzini <bonzini@gnu.org>
* scripts/jar.in: Fix portability problems with Solaris /bin/sh.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137912 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/scripts/jar.in | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1caf0ef248b..13649995233 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-07-16 Roger Sayle <roger@eyesopen.com> + Paolo Bonzini <bonzini@gnu.org> + + * scripts/jar.in: Fix portability problems with Solaris /bin/sh. + 2008-07-08 Matthias Klose <doko@ubuntu.com> * libtool-version: Bump soversion. diff --git a/libjava/scripts/jar.in b/libjava/scripts/jar.in index 82ea10c2912..e9cb9f5822e 100644 --- a/libjava/scripts/jar.in +++ b/libjava/scripts/jar.in @@ -96,7 +96,7 @@ copy () { return 0 fi - if test -e "$2"/"$1"; then + if test -f "$2"/"$1"; then error "$1": Duplicate entry. fi dir=`dirname "$1"` @@ -249,8 +249,7 @@ jar_list_verbose () { } # mkdir -p emulation based on the mkinstalldirs script. -mkdir_p () -{ +func_mkdir_p () { for file do case $file in @@ -290,7 +289,7 @@ mkdir_p () if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then mkdir_p='mkdir -p' else - mkdir_p='mkdir_p' + mkdir_p='func_mkdir_p' test -d ./-p && rmdir ./-p test -d ./--version && rmdir ./--version fi |