Merge

Wed, 08 Dec 2010 01:15:17 -0800

author
igor
date
Wed, 08 Dec 2010 01:15:17 -0800
changeset 270
9dd65b426626
parent 269
e6a650447dfe
parent 256
2c2d4f88637b
child 271
c71d8feeb2ea

Merge

     1.1 --- a/make/deploy-rules.gmk	Mon Dec 06 00:43:27 2010 -0800
     1.2 +++ b/make/deploy-rules.gmk	Wed Dec 08 01:15:17 2010 -0800
     1.3 @@ -46,7 +46,6 @@
     1.4  # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
     1.5  ifeq ($(ARCH_DATA_MODEL), 32)
     1.6    ifeq ($(PLATFORM), windows)
     1.7 -    ifneq ($(KERNEL), off)
     1.8        EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
     1.9          $(ECHO) true ; \
    1.10        else \
    1.11 @@ -55,7 +54,6 @@
    1.12    ifeq ($(EC_TMP), true)
    1.13          DEPLOY_BUILD_TARGETS += extra-comp-all
    1.14        endif
    1.15 -    endif
    1.16    endif
    1.17  endif
    1.18  

mercurial