git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jar.in: Fix portability problems with Solaris /bin/sh. 

2008-07-16  Roger Sayle  <roger@eyesopen.com>
	    Paolo Bonzini  <bonzini@gnu.org>

	* scripts/jar.in: Fix portability problems with Solaris /bin/sh.

Co-Authored-By: Paolo Bonzini <bonzini@gnu.org>

From-SVN: r137912
This commit is contained in:
Roger Sayle 2008-07-17 08:58:15 +00:00 committed by Paolo Bonzini
parent bdad068304
commit 8a63781b05
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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> 2008-07-08 Matthias Klose <doko@ubuntu.com>
* libtool-version: Bump soversion. * libtool-version: Bump soversion.

7
libjava/scripts/jar.in
View File

@ -96,7 +96,7 @@ copy () {
return 0 return 0
fi fi
if test -e "$2"/"$1"; then if test -f "$2"/"$1"; then
error "$1": Duplicate entry. error "$1": Duplicate entry.
fi fi
dir=`dirname "$1"` dir=`dirname "$1"`
@ -249,8 +249,7 @@ jar_list_verbose () {
} }
# mkdir -p emulation based on the mkinstalldirs script. # mkdir -p emulation based on the mkinstalldirs script.
mkdir_p () func_mkdir_p () {
{
for file for file
do do
case $file in case $file in
@ -290,7 +289,7 @@ mkdir_p ()
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
mkdir_p='mkdir -p' mkdir_p='mkdir -p'
else else
mkdir_p='mkdir_p' mkdir_p='func_mkdir_p'
test -d ./-p && rmdir ./-p test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version test -d ./--version && rmdir ./--version
fi fi