Merge
authorjqzuo
Mon, 21 Feb 2011 14:18:37 -0500
changeset 8260 f36df1e880c8
parent 8252 e6e18d40374d (current diff)
parent 8259 21737f54a410 (diff)
child 8262 836de2e4bdee
Merge
--- 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