# HG changeset patch
# User jqzuo
# Date 1298315917 18000
# Node ID 5466f13d19bed4595aeba20b2652e10135491c54
# Parent  995077c73fbbce4719fff62c8c1789ade6be38b7# Parent  e2370dfcc7219dae0acf97f0f1a96ef96ce631e0
Merge

diff -r 995077c73fbb -r 5466f13d19be make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Fri Feb 18 14:23:28 2011 -0800
+++ b/make/deploy-rules.gmk	Mon Feb 21 14:18:37 2011 -0500
@@ -64,19 +64,17 @@
     endif
   endif
 endif
-  
-ifneq ($(KERNEL), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ifeq ($(PLATFORM), windows)
-      # Only set up to use UPX compression if it is available
-      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
-        $(ECHO) true ; \
-      else \
-        $(ECHO) false ; \
-      fi )
-      ifeq ($(UP_TMP), true)
-        DEPLOY_BUILD_TARGETS += cmd-comp-all
-      endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(PLATFORM), windows)
+    # Only set up to use UPX compression if it is available
+    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
+      $(ECHO) true ; \
+    else \
+      $(ECHO) false ; \
+    fi )
+    ifeq ($(UP_TMP), true)
+      DEPLOY_BUILD_TARGETS += cmd-comp-all
     endif
   endif
 endif