changeset 835:7deff16cf438

Merge
author jqzuo
date Mon, 14 Oct 2013 18:53:53 -0400
parents 3ece65f23ed2 00ae95ca1755
children 547316ea137d
files common/autoconf/generated-configure.sh
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/install-rules.gmk	Fri Oct 11 00:06:56 2013 -0700
+++ b/make/install-rules.gmk	Mon Oct 14 18:53:53 2013 -0400
@@ -96,7 +96,6 @@
 combo_build:
 	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
-	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all