--- a/skins/AknSkinContent/group/skingenerator.flm	Wed Mar 31 23:10:44 2010 +0300
+++ b/skins/AknSkinContent/group/skingenerator.flm	Wed Apr 07 13:02:45 2010 +0100
@@ -40,36 +40,30 @@
 
 # AKNSTARGETDIR    --> to copy .skn files
 # AKNSBMPTARGETDIR --> to copy .mif/.mbm files
+#MattD 20091208 - Would be prettier if I generated these, but I'm short on time...
+AKNSTARGETDIR:=$(EPOCROOT)/epoc32/data/z/private/10207114/import/$(AKNSSKINUID)
+AKNSTARGETDIR:=${AKNSTARGETDIR} $(EPOCROOT)/epoc32/release/winscw/udeb/z/private/10207114/import/$(AKNSSKINUID)
+AKNSTARGETDIR:=${AKNSTARGETDIR} $(EPOCROOT)/epoc32/release/winscw/urel/z/private/10207114/import/$(AKNSSKINUID)
 
-ifeq ($(PLATFORM),ARMV5)
-  AKNSTARGETDIR:=$(EPOCROOT)/epoc32/data/z/private/10207114/import/$(AKNSSKINUID)
-  AKNSBMPTARGETDIR:=$(EPOCROOT)/epoc32/data/z/resource/skins/$(AKNSSKINUID)
-else
-  AKNSTARGETDIR:=$(EPOCROOT)/epoc32/release/$(PLATFORM)/$(CFG)/z/private/10207114/import/$(AKNSSKINUID)
-  AKNSBMPTARGETDIR:=$(EPOCROOT)/epoc32/release/$(PLATFORM)/$(CFG)/z/resource/skins/$(AKNSSKINUID)
-endif
+AKNSBMPTARGETDIR:=$(EPOCROOT)/epoc32/data/z/resource/skins/$(AKNSSKINUID)
+AKNSBMPTARGETDIR:=${AKNSBMPTARGETDIR} $(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/skins/$(AKNSSKINUID)
+AKNSBMPTARGETDIR:=${AKNSBMPTARGETDIR} $(EPOCROOT)/epoc32/release/winscw/urel/z/resource/skins/$(AKNSSKINUID)
 
 CREATABLEPATHS:=$(AKNSTARGETDIR) $(AKNSBMPTARGETDIR)
 
-ifeq ($(strip $(AKNSSRCDIR)),)
-# Output dir for the skins
-AKNSSRCDIR:=$(EPOCROOT)/epoc32/include/skins/$(AKNSSKINREALNAME)
-else
-AKNSSRCDIR:=$(EXTENSION_ROOT)/$(AKNSSRCDIR)
-endif
-
 # By default
 #AKNSGENDIR:=
-AKNSDATAGENDIR:=$(EXTENSION_ROOT)/../generated/$(AKNSSKINNAME)/data
+AKNSDATAGENDIR:=$(EPOCROOT)/epoc32/build/generated/skins/$(AKNSSKINNAME)/data
 AKNSTARGETDIR:=$(subst //,/,$(AKNSTARGETDIR))
 AKNSBMPTARGETDIR:=$(subst //,/,$(AKNSBMPTARGETDIR))
 AKNSSRCDIR:=$(subst //,/,$(AKNSSRCDIR))
 AKNSGENDIR:=$(subst //,/,$(AKNSGENDIR))
 EPOCTOOLS:=$(subst //,/,$(EPOCTOOLS))
 
+TARGETSKN:=$(subst //,/,$(patsubst %, %/$(notdir $(AKNSSKINREALNAME).skn),$(AKNSTARGETDIR)))
+TARGETMIF:=$(subst //,/,$(patsubst %, %/$(notdir $(AKNSSKINREALNAME).mif),$(AKNSBMPTARGETDIR)))
+TARGETMBM:=$(subst //,/,$(patsubst %, %/$(notdir $(AKNSSKINREALNAME).mbm),$(AKNSBMPTARGETDIR)))
 
-TARGETSKN:=$(AKNSTARGETDIR)/$(AKNSSKINREALNAME).skn
-TARGETMIF:=$(AKNSBMPTARGETDIR)/$(AKNSSKINREALNAME).mif
 CREATABLEPATHS:=$(CREATABLEPATHS) $(AKNSGENDIR) $(AKNSDATAGENDIR)
 
 ifeq ($(SKINDEBUG),0)
@@ -87,24 +81,28 @@
 $(SKNMIFGUARD):=1
 RELEASEABLES:=$(TARGETSKN) $(TARGETMIF)
 ifeq ($(INPUTBMPS),yes)
-RELEASEABLES:=$(RELEASEABLES) $(basename $(TARGETMIF)).mbm
+RELEASEABLES:=$(RELEASEABLES) $(TARGETMBM)
 endif
 
-BITMAP:: $(TARGETMIF)
+BITMAP:: $(RELEASEABLES)
 
 $(TARGETMIF) : $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif
-	$(call startrule,mifskncopy,FORCESUCCESS) \
-	$(GNUCP) $$< $$@ && \
-	$(GNUCHMOD) a+rw "$$@" && \
-	$(GNUCP) $$(basename $$<).skn $(TARGETSKN) && \
-	$(GNUCHMOD) a+rw "$(TARGETSKN)" \
-	$(call endrule,mifskncopy)
-ifeq ($(INPUTBMPS),yes)
+	$(call startrule,mifcopy,FORCESUCCESS) \
+	$(GNUCP) '$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif' '$$@' \
+	$(call endrule,mifcopy)
+
+$(TARGETSKN) : $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn
+	$(call startrule,skincopy,FORCESUCCESS) \
+	$(GNUCP) '$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn' '$$@' \
+	$(call endrule,skincopy)
+
+$(TARGETMBM) : $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm 
 	$(call startrule,mbmcopy,FORCESUCCESS) \
-	$(GNUCP) $$(basename $$<).mbm $$(basename $$@).mbm && \
-	$(GNUCHMOD) a+rw "$$(basename $$@).mbm" \
+	$(GNUCP) '$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm' '$$@' \
 	$(call endrule,mbmcopy)
-endif
+
+# Quick patch to get it to do the right thing...
+$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm : $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif 
 
 $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn : $(SKINCOMPILER) $(AKNSSRCDIR)/$(AKNSSKINNAME).txt
 	$(call startrule,generateskn,FORCESUCCESS) \
@@ -117,16 +115,8 @@
 $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif : $(MIFTOOL) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn
 	$(call startrule,generatemif,FORCESUCCESS)\
 	cd $(AKNSSRCDIR) && \
-	$(MIFTOOL) $(AKNSSKINREALNAME).mif -F$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME)_MIFList.txt && \
-	$(GNUCP) $(AKNSSKINREALNAME).mif $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif \
+	$(MIFTOOL) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif -V$(SVGENCODINGVERSION) -F$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME)_MIFList.txt \
 	$(call endrule,generatemif)
-ifeq ($(INPUTBMPS),yes)
-	$(call startrule,copymbm2generatedfolder,FORCESUCCESS)\
-	cd $(AKNSSRCDIR) && \
-	$(GNUCP) $(AKNSSKINREALNAME).mbm $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm \
-	$(call endrule,copymbm2generatedfolder)
-endif	
-	
 
 CLEANTARGETS:=$$(CLEANTARGETS) $$(RELEASEABLES) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif
 ifeq ($(INPUTBMPS),yes)