Mercurial > hg > icedtea6
changeset 245:3be97382655c
2007-10-09 Lillian Angel <langel@redhat.com>
* Makefile.am: Added sanity check for bootstrap/jdk1.6.0/bin/java in
stamps/bootstrap-directory-symlink.stamp target.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Tue, 09 Oct 2007 12:15:36 -0400 |
parents | 3c3113af9dd6 |
children | 4ba08889bbff |
files | ChangeLog Makefile.am Makefile.in |
diffstat | 3 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 09 11:33:56 2007 -0400 +++ b/ChangeLog Tue Oct 09 12:15:36 2007 -0400 @@ -1,3 +1,8 @@ +2007-10-09 Lillian Angel <langel@redhat.com> + + * Makefile.am: Added sanity check for bootstrap/jdk1.6.0/bin/java in + stamps/bootstrap-directory-symlink.stamp target. + 2007-10-09 Lillian Angel <langel@redhat.com> * patches/icedtea-java.security.patch: Removed
--- a/Makefile.am Tue Oct 09 11:33:56 2007 -0400 +++ b/Makefile.am Tue Oct 09 12:15:36 2007 -0400 @@ -180,6 +180,12 @@ mkdir -p bootstrap rm -f bootstrap/jdk1.6.0 ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0 + if ! bootstrap/jdk1.6.0/bin/java -version ; \ + then \ + echo "bootstrap/jdk1.6.0/bin/java" \ + "cannot be found or is corrupted." ; \ + exit 1; \ + fi mkdir -p stamps touch stamps/bootstrap-directory-symlink.stamp
--- a/Makefile.in Tue Oct 09 11:33:56 2007 -0400 +++ b/Makefile.in Tue Oct 09 12:15:36 2007 -0400 @@ -650,6 +650,12 @@ mkdir -p bootstrap rm -f bootstrap/jdk1.6.0 ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0 + if ! bootstrap/jdk1.6.0/bin/java -version ; \ + then \ + echo "bootstrap/jdk1.6.0/bin/java" \ + "cannot be found or is corrupted." ; \ + exit 1; \ + fi mkdir -p stamps touch stamps/bootstrap-directory-symlink.stamp