Mercurial > hg > release > icedtea6-1.3

changeset 65:d3dc9041b126

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-29 Lillian Angel <langel@redhat.com> * Makefile.am: Added checks to prevent make error after make bootstrap. * Makefile.in: Regenerated.
author Lillian Angel <langel@redhat.com>
date Fri, 29 Jun 2007 12:34:07 -0400
parents ab6ec85956fb
children 6072ec7c6ce7
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 56 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 27 13:46:35 2007 -0400
+++ b/ChangeLog	Fri Jun 29 12:34:07 2007 -0400
@@ -1,3 +1,9 @@
+2007-06-29  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Added checks to prevent make error after make
+	bootstrap.
+	* Makefile.in: Regenerated.
+
 2007-06-27  Lillian Angel  <langel@redhat.com>
 
 	* .hgignore: Updated.
--- a/Makefile.am	Wed Jun 27 13:46:35 2007 -0400
+++ b/Makefile.am	Fri Jun 29 12:34:07 2007 -0400
@@ -345,13 +345,31 @@
 
 boot:
 	mkdir -p bootstrap/jdk1.6.0/bin
-	mkdir -p bootstrap/jdk1.6.0/lib/endorsed
-	ln -sf $(JAVA) bootstrap/jdk1.6.0/bin/java
-	ln -sf $(JAVAH) bootstrap/jdk1.6.0/bin/javah
-	ln -sf $(RMIC) bootstrap/jdk1.6.0/bin/rmic
-	ln -sf $(JAR) bootstrap/jdk1.6.0/bin/jar
-	cp -f javac bootstrap/jdk1.6.0/bin/javac
-	cp -f javap bootstrap/jdk1.6.0/bin/javap
+	mkdir -p bootstrap/jdk1.6.0/lib/endorsed	
+	if ! test -f bootstrap/jdk1.6.0/bin/java; \
+	then \
+		ln -s $(JAVA) bootstrap/jdk1.6.0/bin/java; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javah; \
+	then \
+		ln -s $(JAVAH) bootstrap/jdk1.6.0/bin/javah; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/rmic; \
+	then \
+		ln -s $(RMIC) bootstrap/jdk1.6.0/bin/rmic; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/jar; \
+	then \
+		ln -s $(JAR) bootstrap/jdk1.6.0/bin/jar; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javac; \
+	then \
+		cp javac bootstrap/jdk1.6.0/bin/javac; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javap; \
+	then \
+		cp javac bootstrap/jdk1.6.0/bin/javap; \
+	fi;
 	ln -sf $(XALAN2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2.jar
 	ln -sf $(XALAN2_SERIALIZER_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xerces-j2.jar
--- a/Makefile.in	Wed Jun 27 13:46:35 2007 -0400
+++ b/Makefile.in	Fri Jun 29 12:34:07 2007 -0400
@@ -771,13 +771,31 @@
 
 boot:
 	mkdir -p bootstrap/jdk1.6.0/bin
-	mkdir -p bootstrap/jdk1.6.0/lib/endorsed
-	ln -sf $(JAVA) bootstrap/jdk1.6.0/bin/java
-	ln -sf $(JAVAH) bootstrap/jdk1.6.0/bin/javah
-	ln -sf $(RMIC) bootstrap/jdk1.6.0/bin/rmic
-	ln -sf $(JAR) bootstrap/jdk1.6.0/bin/jar
-	cp -f javac bootstrap/jdk1.6.0/bin/javac
-	cp -f javap bootstrap/jdk1.6.0/bin/javap
+	mkdir -p bootstrap/jdk1.6.0/lib/endorsed	
+	if ! test -f bootstrap/jdk1.6.0/bin/java; \
+	then \
+		ln -s $(JAVA) bootstrap/jdk1.6.0/bin/java; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javah; \
+	then \
+		ln -s $(JAVAH) bootstrap/jdk1.6.0/bin/javah; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/rmic; \
+	then \
+		ln -s $(RMIC) bootstrap/jdk1.6.0/bin/rmic; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/jar; \
+	then \
+		ln -s $(JAR) bootstrap/jdk1.6.0/bin/jar; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javac; \
+	then \
+		cp javac bootstrap/jdk1.6.0/bin/javac; \
+	fi; \
+	if ! test -f bootstrap/jdk1.6.0/bin/javap; \
+	then \
+		cp javac bootstrap/jdk1.6.0/bin/javap; \
+	fi;
 	ln -sf $(XALAN2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2.jar
 	ln -sf $(XALAN2_SERIALIZER_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xerces-j2.jar