Mercurial > hg > release > icedtea7-2.2
changeset 2276:60b7879c73d7
Clone build directory if it exists so that JAXWS sources are available to the bootstrap build.
2010-06-28 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(clone-boot): Clone build directory too if
it exists.
(patch-jaxws): Fix typo.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 28 Jun 2010 14:20:49 +0100 |
| parents | 74cfd211da47 |
| children | b18f5ecf2522 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 27 22:57:18 2010 +0100 +++ b/ChangeLog Mon Jun 28 14:20:49 2010 +0100 @@ -1,4 +1,11 @@ -2010-06-25 Andrew John Hughes <ahughes@redhat.com> +2010-06-28 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (clone-boot): Clone build directory too if + it exists. + (patch-jaxws): Fix typo. + +2010-06-27 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (OPENJDK_BOOT_TREE): Set to patch-jaxws.stamp.
--- a/Makefile.am Sun Jun 27 22:57:18 2010 +0100 +++ b/Makefile.am Mon Jun 28 14:20:49 2010 +0100 @@ -1512,6 +1512,9 @@ stamps/clone-boot.stamp: $(OPENJDK_TREE) if ! test -d openjdk-boot ; then \ cp -pPRl openjdk openjdk-boot ; \ + if [ -e $(BUILD_OUTPUT_DIR) ] ; then \ + cp -pPRl $(BUILD_OUTPUT_DIR) $(BOOT_BUILD_OUTPUT_DIR) ; \ + fi ; \ fi mkdir -p stamps touch $@ @@ -1577,7 +1580,7 @@ touch stamps/patch-jaxws.stamp.tmp if DTDTYPE_QNAME set -e ; \ - (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws;o \ + (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ all_patches_ok=yes; \ for p in $(JAXWS_PATCHES) ; \ do \