diff options
| author | Dalibor Topic <robilad@yahoo.com> | 2006-11-26 23:00:49 +0000 |
|---|---|---|
| committer | Dalibor Topic <robilad@yahoo.com> | 2006-11-26 23:00:49 +0000 |
| commit | 06dfc53da0fea2430c935ab693c7385d60825997 (patch) | |
| tree | 28f73ef538b139b028a7b2f6aa7a092f6a38d064 | |
| parent | d1dcc0854fb444720d1d9c57780aeef887a64ec3 (diff) | |
| download | classpath-06dfc53da0fea2430c935ab693c7385d60825997.tar.gz | |
Fix for bug #25557
2006-11-26 Roger Sayle <roger <at> eyesopen.com>
Ian Lance Taylor <ian <at> airs.com>
Paolo Bonzini <bonzini <at> gnu.org>
Fixes bug #25557.
* lib/gen-classlist.sh.in: Avoid using test's -ef operator for
increased portability. Likewise, use -f instead of -e.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 6 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2006-11-26 Roger Sayle <roger <at> eyesopen.com> + Ian Lance Taylor <ian <at> airs.com> + Paolo Bonzini <bonzini <at> gnu.org> + + Fixes bug #25557. + + * lib/gen-classlist.sh.in: Avoid using test's -ef operator for + increased portability. Likewise, use -f instead of -e. + 2006-11-26 Mark Wielaard <mark@klomp.org> * lib/Makefile.am (propertydirs): Removed. diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index c6a3a5aa5..6e4b8b876 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -55,7 +55,9 @@ for dir in $vm_dirlist; do done # Only include generated files once. -if test ! "${top_builddir}" -ef "@top_srcdir@"; then +abs_top_builddir=`cd "${top_builddir}"; pwd` +abs_top_srcdir=`cd "@top_srcdir@"; pwd` +if test "$abs_top_builddir" != "$abs_top_srcdir"; then echo "Adding generated files in builddir '${top_builddir}'." # Currently the only generated files are in gnu.*. (cd ${top_builddir}; @FIND@ gnu -follow -name '*.java' -print) | @@ -95,7 +97,7 @@ rm vm.add rm tmp.omit new= -if test -e ${top_builddir}/lib/classes.2; then +if test -f ${top_builddir}/lib/classes.2; then p=`diff ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1` if test "$p" != ""; then new="true" |