/hg/icedtea: Use a different name for the build copy of the gene...

[andrew at icedtea.classpath.org]

changeset ebc77668bad5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ebc77668bad5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 19:32:13 2010 +0100

	Use a different name for the build copy of the generated directory.

	2010-07-12 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/521 (ICEDTEA_ENV): Use generated.build.
	(generated): Copy to generated.build rather than generated
	so the source and build copies are clearly distinct (and
	present on srcdir=builddir builds) (clean-generated): Delete
	generated.build in all cases.


diffstat:

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

diffs (51 lines):

diff -r 23c9af44a7d5 -r ebc77668bad5 ChangeLog
--- a/ChangeLog	Mon Jul 12 17:55:39 2010 +0100
+++ b/ChangeLog	Mon Jul 12 19:32:13 2010 +0100
@@ -1,3 +1,12 @@ 2010-07-12 Andrew John Hughes  <ahughes@
+2010-07-12 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/521
+	(ICEDTEA_ENV): Use generated.build.
+	(generated): Copy to generated.build rather than
+	generated so the source and build copies are clearly
+	distinct (and present on srcdir=builddir builds)
+	(clean-generated): Delete generated.build in all cases.
+
 2010-07-12 Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/521
diff -r 23c9af44a7d5 -r ebc77668bad5 Makefile.am
--- a/Makefile.am	Mon Jul 12 17:55:39 2010 +0100
+++ b/Makefile.am	Mon Jul 12 19:32:13 2010 +0100
@@ -552,7 +552,7 @@ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT):$(ICEDTEA_RT)" \
 	BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT)" \
 	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT)" \
-	GENSRCDIR="$(abs_top_builddir)/generated" \
+	GENSRCDIR="$(abs_top_builddir)/generated.build" \
 	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
 	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
 	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
@@ -1314,18 +1314,16 @@ clean-ports:
 
 stamps/generated.stamp: stamps/ports.stamp
 	set -e ; \
-	if [ ! -e $(abs_top_builddir)/generated ]; then \
-	  cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/generated $(abs_top_builddir); \
-	  find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+	if [ ! -e $(abs_top_builddir)/generated.build ]; then \
+	  cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \
+	  find $(abs_top_builddir)/generated.build -type f -exec chmod 640 '{}' ';' \
 	    -o -type d -exec chmod 750 '{}' ';'; \
 	fi
 	mkdir -p stamps
 	touch $@
 
 clean-generated:
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-	  rm -rf $(abs_top_builddir)/generated ; \
-	fi
+	rm -rf $(abs_top_builddir)/generated.build
 	rm -f stamps/generated.stamp
 
 stamps/patch-fsg.stamp: stamps/generated.stamp