Merge
This commit is contained in:
commit
da21c733ee
@ -23,8 +23,22 @@
|
|||||||
# questions.
|
# 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
|
ifndef JPRT_ARCHIVE_BUNDLE
|
||||||
JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
|
JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user