# HG changeset patch
# User lana
# Date 1400794672 25200
# Node ID 7b5840dda425303c0e1d7869a41ec6d00db0eb1a
# Parent  67fc100cd1c3107632289a331fe0123485b909be# Parent  54baaf3fa2cad78cdb1c003cff1321d5606c44ca
Merge

diff -r 67fc100cd1c3 -r 7b5840dda425 make/Jprt.gmk
--- a/make/Jprt.gmk	Thu May 22 12:53:39 2014 -0700
+++ b/make/Jprt.gmk	Thu May 22 14:37:52 2014 -0700
@@ -23,8 +23,22 @@
 # questions.
 #
 
-# This file is contains targets utilities needed by JPRT.
+# This file contains targets and utilities needed by JPRT.
 
+# Cygpath is only defined when running on Cygwin
+ifneq ($(CYGPATH), )
+  # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive
+  # style paths
+  ifdef JPRT_ARCHIVE_BUNDLE
+    override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE))
+  endif
+  ifdef JPRT_ARCHIVE_INSTALL_BUNDLE
+    override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE))
+  endif
+endif
+
+# When running in JPRT these will be provided. Need defaults so that this makefile
+# is valid anyway.
 ifndef JPRT_ARCHIVE_BUNDLE
   JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
 endif