diff options
author | cgruszka <none@none> | 2013-01-23 08:50:19 -0500 |
---|---|---|
committer | cgruszka <none@none> | 2013-01-23 08:50:19 -0500 |
commit | 8eeba9cfca9d0ab6f5390c6e5e1f5ca579381683 (patch) | |
tree | bd30485c14bd166bd7b4118369caf7271c9db91b /make | |
parent | 027e55d5369ef4ced4cadd0b9f3787995bf3d9bb (diff) | |
parent | 89e5b362e02c484852b0c60364cc12c65d763e04 (diff) |
Merge
Diffstat (limited to 'make')
-rw-r--r-- | make/install-rules.gmk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/make/install-rules.gmk b/make/install-rules.gmk index 609cc2a..2bde487 100644 --- a/make/install-rules.gmk +++ b/make/install-rules.gmk @@ -96,6 +96,9 @@ endif 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 install-clobber: ifeq ($(BUILD_INSTALL), true) |