@@ -13,28 +13,22 @@
 if {[lindex $argv 2] != ""} {
 	set opt_compression [lindex $argv 2]
 }
 
 # Determine what storage mechanism is being used
-## This logic must be duplicated from "kitInit.c"
-set fd [open Makefile r]
+set fd [open Makefile.common r]
 set data [read $fd]
 close $fd
 
 if {[string match "*KIT_STORAGE_ZIP*" $data]} {
 	set tclKitStorage zip
 }
 if {[string match "*KIT_STORAGE_MK4*" $data]} {
 	set tclKitStorage mk4
 }
-
-if {![info exists tclKitStorage]} {
-	if {[string match "*KIT_INCLUDES_MK4TCL*" $data]} {
-		set tclKitStorage mk4
-	} else {
-		set tclKitStorage zip
-	}
+if {[string match "*KIT_STORAGE_CVFS*" $data]} {
+	set tclKitStorage cvfs
 }
 
 # Define procedures
 proc copy_file {srcfile destfile} {
 	switch -glob -- $srcfile {
@@ -115,7 +109,10 @@
 		} err]} {
 			puts stderr "Error while updating executable: $err"
 
 			exit 1
 		}
+	}
+	"cvfs" {
+		# No-op
 	}
 }