Index: ipk/make-ipk
===================================================================
--- ipk/make-ipk	(revision 8576)
+++ ipk/make-ipk	(revision 8587)
@@ -111,21 +111,10 @@
 . ./config/make-config
 
-if [ $CPUTYPE = "sh4" ];then
-	cp -a "$HOMEDIR"/source.sh4/* "$HOMEDIR"/BUILD
-elif [ $CPUTYPE = "mipsel" ];then
-	cp -a "$HOMEDIR"/source.sh4/spinner* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/settings* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/radio* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/p* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/m* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/i* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/game* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/fonts* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/epg* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/editor* "$HOMEDIR"/BUILD
-	sleep 5
+cp -a "$HOMEDIR"/source/* "$HOMEDIR"/BUILD
+cp -a "$HOMEDIR"/source."$CPUTYPE"/* "$HOMEDIR"/BUILD
+
+if [ $CPUTYPE = "mipsel" ];then
 	rm -r "$HOMEDIR"/BUILD/*/CONTROL/pre*
 	sed -i 's/sh4/mipsel/g' "$HOMEDIR"/BUILD/*/CONTROL/control
-	cp -a "$HOMEDIR"/source.mipsel/* "$HOMEDIR"/BUILD
 fi
 
@@ -134,5 +123,5 @@
 
 LIST_LINE=`cat aaf-flashbeta.txt`
-ALLOWED=`cat "$HOMEDIR"/aaf-flashbeta_allowed`
+ALLOWED=`cat "$HOMEDIR"/trustlist_allowed_"$CPUTYPE"_"$SWTYPE"`
 
 cd "$HOMEDIR"/BUILD