changeset in /hg/icedtea: 2007-12-21 Lillian Angel <langel at red...

[Lillian Angel]

changeset 8ae161d10f7b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8ae161d10f7b
description:
	2007-12-21  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Took out invalid check for ICEDTEA_HOME.
	        * Makefile.in: Regenerate.

diffstat:

3 files changed, 7 insertions(+), 16 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    9 +--------
Makefile.in |    9 +--------

diffs (50 lines):

diff -r a208317f639b -r 8ae161d10f7b ChangeLog
--- 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-20  Lillian Angel  <langel at redha
+2007-12-21  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Took out invalid check for ICEDTEA_HOME.
+	* Makefile.in: Regenerate.
+
 2007-12-20  Lillian Angel  <langel at redhat.com>
 
 	Fixes Bug #65
diff -r a208317f639b -r 8ae161d10f7b Makefile.am
--- a/Makefile.am	Thu Dec 20 14:49:51 2007 -0500
+++ b/Makefile.am	Fri Dec 21 08:37:52 2007 -0500
@@ -301,14 +301,7 @@ stamps/bootstrap-directory-symlink.stamp
 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" \
diff -r a208317f639b -r 8ae161d10f7b Makefile.in
--- a/Makefile.in	Thu Dec 20 14:49:51 2007 -0500
+++ b/Makefile.in	Fri Dec 21 08:37:52 2007 -0500
@@ -792,14 +792,7 @@ stamps/bootstrap-directory-symlink.stamp
 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" \