2 files changed, 21 insertions, 3 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index e6ddab9b3d..107c1b7ff1 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -50,6 +50,7 @@ $ROOT="..";
 my $ziptool="zip -r9";
 my $output="rockbox.zip";
 my $verbose;
+my $sim;
 my $exe;
 my $target;
 my $archos;
@@ -95,6 +96,10 @@ while(1) {
         $verbose =1;
         shift @ARGV;
     }
+    elsif($ARGV[0] eq "-s") {
+        $sim =1;
+        shift @ARGV;
+    }
     else {
         $target = $ARGV[0];
         $exe = $ARGV[1];
@@ -448,7 +453,13 @@ sub runone {
     if($verbose) {
         print "$ziptool $output .rockbox $target >/dev/null\n";
     }
-    system("$ziptool $output .rockbox $target >/dev/null");
+
+    if($sim) {
+        system("cp -r .rockbox archos/ >/dev/null");
+    }
+    else {
+        system("$ziptool $output .rockbox $target >/dev/null");
+    }
 
     # remove the .rockbox afterwards
     rmtree('.rockbox');
diff --git a/tools/configure b/tools/configure
index 43974e8dc8..443ea9fbc6 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2595,7 +2595,8 @@ help:
         @echo "mapzip      - creates rockbox-maps.zip with all .map files"
         @echo "tools       - builds the tools only"
         @echo "voicetools  - builds the voice tools only"
-        @echo "install     - installs your build (for simulator builds only)"
+        @echo "install     - installs your build (for simulator builds only, no fonts)"
+        @echo "fullinstall - installs your build (for simulator builds only, with fonts)"
 
 EOF
 
@@ -2604,8 +2605,14 @@ if [ "yes" = "$simulator" ]; then
  cat >> Makefile <<EOF
 
 install:
+        @echo "installing your build in your archos dir"
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/apps/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -s -r "\$(ROOTDIR)" -f 0 \$(TARGET) \$(BINARY)
+
+fullinstall:
         @echo "installing a full setup in your archos dir"
-        @(\$(MAKE) fullzip && cd archos && unzip -oq ../rockbox-full.zip)
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/apps/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -s -r "\$(ROOTDIR)" -f 2 \$(TARGET) \$(BINARY)
 EOF
 
 fi