FYI: Make distcheck work #01

[Andrew John Hughes]

This is the first of hopefully not too many patches to fix the
use of 'make distcheck' on IcedTea6.

ChangeLog:

2008-06-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am: Use build directory for
	generated directory, and copy there at
	the start if we are doing an out-of-directory
	build.
	* Makefile.in: Regenerated.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r f26e6976de5e Makefile.am
--- a/Makefile.am	Sun Jun 29 17:12:44 2008 +0100
+++ b/Makefile.am	Sun Jun 29 22:47:39 2008 +0100
@@ -166,7 +166,7 @@ ICEDTEA_ENV_ECJ = \
 	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
-	"GENSRCDIR=$(abs_top_srcdir)/generated" \
+	"GENSRCDIR=$(abs_top_builddir)/generated" \
 	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
 	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
 	"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
@@ -415,6 +415,11 @@ if !USE_SYSTEM_CACAO
 	fi
 endif
 endif
+	if [ ! -e $(abs_top_builddir)/generated ]; then \
+	  cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+	  find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+	    -o -type d -exec chmod 750 '{}' ';'; \
+	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
 
@@ -911,12 +916,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -958,12 +963,12 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
 	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
diff -r f26e6976de5e Makefile.in
--- a/Makefile.in	Sun Jun 29 17:12:44 2008 +0100
+++ b/Makefile.in	Sun Jun 29 22:47:39 2008 +0100
@@ -361,7 +361,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
 	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
 	$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
-	"GENSRCDIR=$(abs_top_srcdir)/generated" \
+	"GENSRCDIR=$(abs_top_builddir)/generated" \
 	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
 	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
 	"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
@@ -900,6 +900,11 @@ stamps/extract.stamp: stamps/download.st
 @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	  mkdir cacao ; \
 @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	  $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
 @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	fi
+	if [ ! -e $(abs_top_builddir)/generated ]; then \
+	  cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+	  find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+	    -o -type d -exec chmod 750 '{}' ';'; \
+	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
 
@@ -1331,12 +1336,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -1378,12 +1383,12 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
 	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \