Mercurial > hg > release > icedtea6-1.2

changeset 542:a2e3bda6207a cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-12-21 Lillian Angel <langel@redhat.com> * Makefile.am: Took out invalid check for ICEDTEA_HOME. * Makefile.in: Regenerate.
author Lillian Angel <langel@redhat.com>
date Fri, 21 Dec 2007 08:37:52 -0500
parents 7dc097dff4c2
children db49d7993507
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 7 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Dec 20 14:49:51 2007 -0500
+++ b/ChangeLog	Fri Dec 21 08:37:52 2007 -0500
@@ -1,3 +1,8 @@
+2007-12-21  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Took out invalid check for ICEDTEA_HOME.
+	* Makefile.in: Regenerate.
+
 2007-12-20  Lillian Angel  <langel@redhat.com>
 
 	Fixes Bug #65
--- a/Makefile.am	Thu Dec 20 14:49:51 2007 -0500
+++ b/Makefile.am	Fri Dec 21 08:37:52 2007 -0500
@@ -325,14 +325,7 @@
 stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
 	mkdir -p bootstrap
 	rm -f bootstrap/jdk1.6.0
-	if test -d $(ICEDTEA_HOME); \
-	then \
-	  ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \
-	else \
-	  echo $(ICEDTEA_HOME) " cannot be found. Try reconfiguring with " \
-	    "--with-icedtea-home=/path/to/java-icedtea-devel"; \
-          exit 1; \
-	fi
+	ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \
 	if ! bootstrap/jdk1.6.0/bin/java -version ; \
          then \
            echo "bootstrap/jdk1.6.0/bin/java" \
--- a/Makefile.in	Thu Dec 20 14:49:51 2007 -0500
+++ b/Makefile.in	Fri Dec 21 08:37:52 2007 -0500
@@ -741,14 +741,7 @@
 stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
 	mkdir -p bootstrap
 	rm -f bootstrap/jdk1.6.0
-	if test -d $(ICEDTEA_HOME); \
-	then \
-	  ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \
-	else \
-	  echo $(ICEDTEA_HOME) " cannot be found. Try reconfiguring with " \
-	    "--with-icedtea-home=/path/to/java-icedtea-devel"; \
-          exit 1; \
-	fi
+	ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \
 	if ! bootstrap/jdk1.6.0/bin/java -version ; \
          then \
            echo "bootstrap/jdk1.6.0/bin/java" \