Mercurial > hg > release > icedtea7-forest-2.4
changeset 793:a18ee06070df
Merge
author | asaha |
---|---|
date | Tue, 23 Jul 2013 20:38:20 -0700 |
parents | d2f28b069dc8 (current diff) af755d12719e (diff) |
children | e4bc26c4119a |
files | .hgtags |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jul 19 22:17:36 2013 -0700 +++ b/.hgtags Tue Jul 23 20:38:20 2013 -0700 @@ -330,3 +330,4 @@ 58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31 da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 +a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
--- a/Makefile Fri Jul 19 22:17:36 2013 -0700 +++ b/Makefile Tue Jul 23 20:38:20 2013 -0700 @@ -263,7 +263,7 @@ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ - BUILD_INSTALL_BUNDLES=true \ + $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \ CREATE_DEBUGINFO_BUNDLES=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ generic_build_repo_series