1 files changed, 11 insertions, 30 deletions

diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl
index 02783d356b..7b24ea4880 100755
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-$version="3.4";
+require "../builds.pm";
+my $version = $publicrelease;
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -16,7 +17,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $conf, $nl)=@_;
+    my ($dir)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -28,7 +29,7 @@ sub runone {
     print "Build in buildm-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir, $conf, $nl);
+    $a = buildit($dir);
 
     chdir "..";
 
@@ -53,12 +54,11 @@ sub runone {
 };
 
 sub buildit {
-    my ($target, $confnum, $newl)=@_;
+    my ($target)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure',
-                    $confnum, $newl?'\n':'');
+    my $c = "../tools/configure --target=$target --type=m";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -73,27 +73,8 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-runone("player", "player", 1);
-runone("recorder", "recorder", 1);
-runone("fmrecorder", "fmrecorder", 1);
-runone("recorderv2", "recorderv2", 1);
-runone("ondiosp", "ondiosp", 1);
-runone("ondiofm", "ondiofm", 1);
-runone("h100", "h100");
-#runone("h120", 9);
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", 1);
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("ipodmini2g", "ipodmini2g");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-runone("mrobe100", "mrobe100");
+for my $b (&stablebuilds) {
+    next if ($builds{$b}{configname} < 3); # no variants
+
+    runone($b);
+}