changeset in /hg/icedtea: More out-of-source-directory build fixes.

[gnu_andrew at member.fsf.org]

changeset 1f741702832b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1f741702832b
description:
	More out-of-source-directory build fixes.

diffstat:

3 files changed, 17 insertions(+), 10 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |   10 +++++-----
Makefile.in |   10 +++++-----

diffs (64 lines):

diff -r d550fe3b2a75 -r 1f741702832b ChangeLog
--- a/ChangeLog	Mon May 26 23:24:13 2008 +0100
+++ b/ChangeLog	Tue May 27 00:06:36 2008 +0100
@@ -1,3 +1,10 @@ 2008-05-26  Andrew John Hughes  <gnu_and
+2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	More out-of-source-directory build
+	fixes.
+	* Makefile.in: Regenerated.
+	
 2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/icedtea-libraries.patch:
diff -r d550fe3b2a75 -r 1f741702832b Makefile.am
--- a/Makefile.am	Mon May 26 23:24:13 2008 +0100
+++ b/Makefile.am	Tue May 27 00:06:36 2008 +0100
@@ -559,16 +559,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
-		mkdir -p bootstrap/ecj/lib ; \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
 	then \
-		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-			bootstrap/ecj/jre/lib/rt.jar; \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
diff -r d550fe3b2a75 -r 1f741702832b Makefile.in
--- a/Makefile.in	Mon May 26 23:24:13 2008 +0100
+++ b/Makefile.in	Tue May 27 00:06:36 2008 +0100
@@ -1050,16 +1050,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
-		mkdir -p bootstrap/ecj/lib ; \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
 	then \
-		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-			bootstrap/ecj/jre/lib/rt.jar; \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp