Mercurial > hg > release > icedtea7-2.0
changeset 2436:43c6c4a00875
Fix make distcheck, broken by recent imported patches from IcedTea6.
2011-05-25 Andrew John Hughes <ahughes@redhat.com>
Fix make distcheck.
* Makefile.am:
(EXTRA_DIST): Remove hotspot/default/*.patch.
Add jamvm/*.patch.
(clean-extract-hotspot): Remove remnants of
the attempt to symlink the HotSpot directory.
(clean-add-jamvm): Check jvm.cfg exists
and use full path.
(clean-add-jamvm-debug): Likewise for debug mode.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 25 May 2011 17:33:49 +0100 |
| parents | 3331b5399731 |
| children | 8b248f7009b8 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 25 13:19:52 2011 +0100 +++ b/ChangeLog Wed May 25 17:33:49 2011 +0100 @@ -1,3 +1,15 @@ +2011-05-25 Andrew John Hughes <ahughes@redhat.com> + + Fix make distcheck. + * Makefile.am: + (EXTRA_DIST): Remove hotspot/default/*.patch. + Add jamvm/*.patch. + (clean-extract-hotspot): Remove remnants of + the attempt to symlink the HotSpot directory. + (clean-add-jamvm): Check jvm.cfg exists + and use full path. + (clean-add-jamvm-debug): Likewise for debug mode. + 2011-05-25 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Wed May 25 13:19:52 2011 +0100 +++ b/Makefile.am Wed May 25 17:33:49 2011 +0100 @@ -694,10 +694,10 @@ $(top_srcdir)/pulseaudio/COPYING EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ - $(top_srcdir)/patches/hotspot/default/*.patch \ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/debian/*.patch \ + $(top_srcdir)/patches/jamvm/*.patch \ $(top_srcdir)/patches/security/*.patch \ tools-copy contrib overlays \ javaws.png javaws.desktop \ @@ -1253,10 +1253,7 @@ touch stamps/extract-hotspot.stamp clean-extract-hotspot: - if test -L openjdk/hotspot ; then \ - rm -f openjdk/hotspot - fi - rm -rf hotspot-$(HS_CHANGESET) + rm -rf openjdk/hotspot rm -f stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \ @@ -2122,7 +2119,9 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm.stamp stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp @@ -2138,7 +2137,9 @@ clean-add-jamvm-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm-debug.stamp # CACAO