Mercurial > hg > truffle

comparison make/defs.make @ 4954:f92a171cf007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 17 Feb 2012 15:06:38 -0800
parents f09ae3853e3b
children 7292cff45988
comparison
equal deleted inserted replaced
4953:087daaec688d 4954:f92a171cf007
191 EXPORT_PATH=$(ALT_EXPORT_PATH) 191 EXPORT_PATH=$(ALT_EXPORT_PATH)
192 endif 192 endif
193 193
194 # Default jdk image if one is created for you with create_jdk 194 # Default jdk image if one is created for you with create_jdk
195 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM) 195 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
196 ifneq ($(ALT_JDK_IMAGE_DIR),)
197 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
198 endif
196 199
197 # The platform dependent defs.make defines platform specific variable such 200 # The platform dependent defs.make defines platform specific variable such
198 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 201 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
199 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 202 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
200 203