changeset in /hg/icedtea: Merge out-of-dir patch committed earli...

[gnu_andrew at member.fsf.org]

changeset c67694e0e00b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c67694e0e00b
description:
	Merge out-of-dir patch committed earlier today.

diffstat:

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

diffs (42 lines):

diff -r d74cf8868b77 -r c67694e0e00b ChangeLog
--- a/ChangeLog	Tue May 27 02:30:58 2008 +0100
+++ b/ChangeLog	Tue May 27 20:01:27 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:
+	Fix reference to abs_top_srcdir when
+	accessing bootstrap directory.
+	* Makefile.in: Regenerated.
+
 2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r d74cf8868b77 -r c67694e0e00b Makefile.am
--- a/Makefile.am	Tue May 27 02:30:58 2008 +0100
+++ b/Makefile.am	Tue May 27 20:01:27 2008 +0100
@@ -870,8 +870,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
-	  ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
 # rt-closed.jar class files.
diff -r d74cf8868b77 -r c67694e0e00b Makefile.in
--- a/Makefile.in	Tue May 27 02:30:58 2008 +0100
+++ b/Makefile.in	Tue May 27 20:01:27 2008 +0100
@@ -1309,8 +1309,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
-	  ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
 # rt-closed.jar class files.