/hg/icedtea6: Fix make dist when a relative path is used to conf...

[andrew at icedtea.classpath.org]

changeset 249af2038232 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=249af2038232
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 05 15:38:09 2011 +0100

	Fix make dist when a relative path is used to configure.

	2011-10-05 Andrew John Hughes <ahughes at redhat.com>

	 Fix make dist when a relative path is used to configure.
		* Makefile.am: (REWRITER_BUILD_DIR): Added.
	(REWRITER_SRCS): Don't use absolute path to source
	directory. (EXTRA_DIST): Don't use absolute path to patches.
	(rewriter): Use IcedTea7 version, which uses
	REWRITER_BUILD_DIR and works with a relative path in
	REWRITER_SRCS.


diffstat:

 ChangeLog   |  12 ++++++++++++
 Makefile.am |  13 ++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 3455c384aefd -r 249af2038232 ChangeLog
--- a/ChangeLog	Wed Oct 05 15:22:45 2011 +0100
+++ b/ChangeLog	Wed Oct 05 15:38:09 2011 +0100
@@ -1,3 +1,15 @@
+2011-10-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	Fix make dist when a relative path is used to configure.
+	* Makefile.am:
+	(REWRITER_BUILD_DIR): Added.
+	(REWRITER_SRCS): Don't use absolute
+	path to source directory.
+	(EXTRA_DIST): Don't use absolute path to patches.
+	(rewriter): Use IcedTea7 version, which uses
+	REWRITER_BUILD_DIR and works with a relative
+	path in REWRITER_SRCS.
+
 2011-10-05  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 3455c384aefd -r 249af2038232 Makefile.am
--- a/Makefile.am	Wed Oct 05 15:22:45 2011 +0100
+++ b/Makefile.am	Wed Oct 05 15:38:09 2011 +0100
@@ -46,6 +46,7 @@
 BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
+REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
 
 # Source directories
 
@@ -178,7 +179,7 @@
 
 # Sources list
 
-REWRITER_SRCS = $(abs_top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
 
 # Patch list
 
@@ -600,7 +601,7 @@
 # FIXME (distclean): Add pulseaudio sources
 
 EXTRA_DIST = generated \
-	$(abs_top_srcdir)/patches/* \
+	$(top_srcdir)/patches/* \
 	contrib overlays \
 	jconsole.desktop policytool.desktop \
 	test/jtreg \
@@ -1769,11 +1770,9 @@
 
 stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
 if WITH_RHINO
-	mkdir -p $(abs_top_builddir)/rewriter.build && \
-	(cd $(abs_top_srcdir)/rewriter ; \
-	 $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-	 -d $(abs_top_builddir)/rewriter.build $(REWRITER_SRCS) \
-	)
+	mkdir -p $(REWRITER_BUILD_DIR)
+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+	 -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS)
 endif
 	mkdir -p stamps
 	touch stamps/rewriter.stamp