Index: branches/slice/trunkM/Makefile
===================================================================
--- branches/slice/trunkM/Makefile	(revision 1194)
+++ branches/slice/trunkM/Makefile	(revision 1195)
@@ -4,7 +4,6 @@
 SYMROOT = $(SRCROOT)/sym
 DSTROOT = $(SRCROOT)/dst
 DOCROOT = $(SRCROOT)/doc
-IMGROOT = $(SRCROOT)/sym/cache
 IMGSKELROOT = $(SRCROOT)/imgskel
 CDBOOT = ${IMGROOT}/usr/standalone/i386/cdboot
 
@@ -14,13 +13,17 @@
 
 THEME = default
 
-VERSION = `cat version`
-REVISION = `cat revision`
+VERSION = `cat ${SRCROOT}/version`
+REVISION = `cat ${SRCROOT}/revision`
 PRODUCT = Chameleon-$(VERSION)-r$(REVISION)
 CDLABEL = ${PRODUCT}
 ISOIMAGE = ${SYMROOT}/${CDLABEL}.iso
 DISTFILE = ${SYMROOT}/${PRODUCT}
 
+IMGROOT = $(SRCROOT)/sym/${PRODUCT}
+DISTROOT= ./${PRODUCT}
+
+
 EXCLUDE = --exclude=.svn --exclude=.DS_Store --exclude=sym --exclude=obj \
 		--exclude=package --exclude=archive --exclude=User_Guide_src --exclude=*.sh
 
@@ -100,6 +103,8 @@
 	@mkdir -p ${IMGROOT}/Extra/modules				
 	@echo "\t[MKDIR] ${IMGROOT}/Extra/Themes/Default"
 	@mkdir -p ${IMGROOT}/Extra/Themes/Default				
+	@echo "\t[MKDIR] ${IMGROOT}/usr/bin"
+	@mkdir -p ${IMGROOT}/usr/bin
 	@if [ -e "$(IMGSKELROOT)" ]; then				\
 		@echo "\t[CP] ${IMGROOTSKEL} ${IMGROOT}"		\
 		@cp -R -f "${IMGSKELROOT}"/* "${IMGROOT}";		\
@@ -109,16 +114,20 @@
 	@cp -f ${SRCROOT}/artwork/themes/default/* ${IMGROOT}/Extra/Themes/Default	
 	@cp -f ${SYMROOT}/i386/boot ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot0 ${IMGROOT}/usr/standalone/i386
+	@cp -f ${SYMROOT}/i386/boot0hfs ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot0md ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot1f32 ${IMGROOT}/usr/standalone/i386
+	@cp -f ${SYMROOT}/i386/fdisk440 ${IMGROOT}/usr/bin
+	@cp -f ${SYMROOT}/i386/bdmesg ${IMGROOT}/usr/bin    
+
 	@echo "\t[HDIUTIL] ${ISOIMAGE}"
 	@hdiutil makehybrid -iso -joliet -hfs -hfs-volume-name \
 		${CDLABEL} -eltorito-boot ${CDBOOT} -no-emul-boot -ov -o   \
 		"${ISOIMAGE}" ${IMGROOT} -quiet 		  	  
 	@echo "\t[GZ] ${DISTFILE}.tar.gz"
 	@rm -f ${DISTFILE}.tar.gz
-	@tar -cf ${DISTFILE}.tar ${IMGROOT}
+	@cd ${SYMROOT} && tar -cf ${DISTFILE}.tar ${DISTROOT}
 	@gzip --best ${DISTFILE}.tar
 
 pkg installer: all