Index: branches/reyalp-flt/Makefile
===================================================================
--- branches/reyalp-flt/Makefile	(revision 1467)
+++ branches/reyalp-flt/Makefile	(revision 1481)
@@ -42,4 +42,6 @@
 	mv  $(topdir)bin/main.bin  $(topdir)bin/DISKBOOT.BIN
 endif
+	rm -f $(topdir)CHDK/MODULES/*
+	cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
 	@echo "**** Firmware creation completed successfully"
 
@@ -81,6 +83,4 @@
       endif
     endif
-	rm -f $(topdir)CHDK/MODULES/*
-	cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
 	zip -9 $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)CHDK/MODULES/*
 	# if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
@@ -96,6 +96,4 @@
     endif
 	rm -f $(topdir)bin/DISKBOOT.BIN
-	rm -f $(topdir)CHDK/MODULES/*
-	rm -f $(topdir)core/modules/*.flt
 
 
@@ -133,10 +131,6 @@
 	zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
 	zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
-	rm -f $(topdir)CHDK/MODULES/*
-	cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
 	zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
 	zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
-	rm -f $(topdir)CHDK/MODULES/*
-	rm -f $(topdir)core/modules/*.flt
 
     ifdef PLATFORMOS