diff options
-rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
-rwxr-xr-x | libjava/classpath/lib/split-for-gcj.sh | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 9fde62e..b4de2bc 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2005-08-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * lib/split-for-gcj.sh: Don't use unportable %{parameter%word}. + Don't use unportable !. + 2005-07-15 Tom Tromey <tromey@redhat.com> * ChangeLog.gcj, Makefile.in, aclocal.m4, config.guess, diff --git a/libjava/classpath/lib/split-for-gcj.sh b/libjava/classpath/lib/split-for-gcj.sh index bda7fda..477e0a8 100755 --- a/libjava/classpath/lib/split-for-gcj.sh +++ b/libjava/classpath/lib/split-for-gcj.sh @@ -11,7 +11,7 @@ for dir in java javax gnu org; do list=lists/`echo $pkg | sed -e 's,/,-,g'` echo "$file" >> ${list}.list.1 f2=`echo "$file" | sed -n -e "s,^.*/\($dir/.*\)$,\1,p"` - f2=${f2%.java}.class + f2=`echo "$f2" | sed -e 's/.java$//'`.class echo "$f2: ${list}.stamp" >> Makefile.deps echo "${list}.list: $file" >> Makefile.deps done @@ -19,10 +19,10 @@ done # Only update a .list file if it changed. for file in lists/*.list.1; do - real=${file%.1} - if ! cmp -s $real $file; then - mv $file $real - else + real=`echo "$file" | sed -e 's/.1$//'` + if cmp -s $real $file; then rm $file + else + mv $file $real fi done |