Merge
authorjqzuo
Mon, 14 Oct 2013 18:53:53 -0400
changeset 20361 9392b6c1556d
parent 20343 7d88b7c0abb9 (current diff)
parent 20360 76831144a6cc (diff)
child 20365 d6efd86ba297
Merge
common/autoconf/generated-configure.sh
--- 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