aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorohair <none@none>2011-05-16 08:40:01 -0700
committerohair <none@none>2011-05-16 08:40:01 -0700
commit67abd1e7331799c4ef865dd194af11e500e5eef5 (patch)
tree83a0c70569cd5b199ac4e6ef103deafa27fdbf95 /make
parentc02e7728c5a279875f3025b86ab97cd12b7204b8 (diff)
7043700: Regression for IcedTea buildsjdk7-b143
Reviewed-by: dholmes, omajid
Diffstat (limited to 'make')
-rw-r--r--make/jprt.gmk6
1 files changed, 3 insertions, 3 deletions
diff --git a/make/jprt.gmk b/make/jprt.gmk
index 49687d9..b8c8525 100644
--- a/make/jprt.gmk
+++ b/make/jprt.gmk
@@ -37,7 +37,7 @@ JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
jprt_build_product: sanity all_product_build
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
+ ( $(CD) $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
ifdef HAVE_JPRT_SAVE_BUNDLES
( $(CD) $(OUTPUTDIR)/bundles && \
@@ -45,11 +45,11 @@ ifdef HAVE_JPRT_SAVE_BUNDLES
endif
jprt_build_fastdebug: fastdebug_build
- ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/j2sdk-image && \
+ ( $(CD) $(OUTPUTDIR)/$(REL_JDK_FASTDEBUG_IMAGE_DIR) && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
jprt_build_debug: debug_build
- ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/j2sdk-image && \
+ ( $(CD) $(OUTPUTDIR)/$(REL_JDK_DEBUG_IMAGE_DIR) && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
################################################################