Merge

Mon, 21 Feb 2011 14:18:37 -0500

author
jqzuo
date
Mon, 21 Feb 2011 14:18:37 -0500
changeset 308
5466f13d19be
parent 300
995077c73fbb
parent 307
e2370dfcc721
child 310
5d86d951426a

Merge

     1.1 --- a/make/deploy-rules.gmk	Fri Feb 18 14:23:28 2011 -0800
     1.2 +++ b/make/deploy-rules.gmk	Mon Feb 21 14:18:37 2011 -0500
     1.3 @@ -64,19 +64,17 @@
     1.4      endif
     1.5    endif
     1.6  endif
     1.7 -  
     1.8 -ifneq ($(KERNEL), off)
     1.9 -  ifeq ($(ARCH_DATA_MODEL), 32)
    1.10 -    ifeq ($(PLATFORM), windows)
    1.11 -      # Only set up to use UPX compression if it is available
    1.12 -      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
    1.13 -        $(ECHO) true ; \
    1.14 -      else \
    1.15 -        $(ECHO) false ; \
    1.16 -      fi )
    1.17 -      ifeq ($(UP_TMP), true)
    1.18 -        DEPLOY_BUILD_TARGETS += cmd-comp-all
    1.19 -      endif
    1.20 +
    1.21 +ifeq ($(ARCH_DATA_MODEL), 32)
    1.22 +  ifeq ($(PLATFORM), windows)
    1.23 +    # Only set up to use UPX compression if it is available
    1.24 +    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
    1.25 +      $(ECHO) true ; \
    1.26 +    else \
    1.27 +      $(ECHO) false ; \
    1.28 +    fi )
    1.29 +    ifeq ($(UP_TMP), true)
    1.30 +      DEPLOY_BUILD_TARGETS += cmd-comp-all
    1.31      endif
    1.32    endif
    1.33  endif

mercurial