X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=BUILD.pl;h=ae67a9364ca9e6fce0a75744fdaaee94c28d2160;hb=98ffdda59a136fb65c81ebb9fc0b5f045db5acf4;hp=5a65199691ed7bc11b9ef96e53c0f5dd314d76fb;hpb=5489745c3b2fa7af32b99aae21fcf16ed541121a;p=fedora-mingw.git

diff --git a/BUILD.pl b/BUILD.pl
index 5a65199..ae67a93 100755
--- a/BUILD.pl
+++ b/BUILD.pl
@@ -56,6 +56,7 @@ sub main {
     delete $br{"mingw-cyrus-sasl"};
     delete $br{"mingw-nsis"};
     delete $br{"mingw-wix"};
+    delete $br{"mingw-example"};
 
     # There is a dependency loop (gcc -> runtime/w32api -> gcc)
     # which has to be manually resolved below.  Break that loop.
@@ -84,6 +85,8 @@ sub main {
 	unlink "/tmp/tsort2.tmp";
     }
 
+    my %installed;
+
     while (<PACKAGES>) {
 	chomp;
 	if (/^mingw-(.*)/) {
@@ -97,8 +100,9 @@ sub main {
 	    # Are all BR RPMs installed?
 	    my $br;
 	    foreach $br (@brs) {
-		if (! rpm_installed ($br)) {
+		if (! rpm_installed ($br) && !exists $installed{$br}) {
 		    print "as root # rpm -Uvh $br*.rpm\n";
+		    $installed{$br} = 1;
 		}
 	    }
 
@@ -107,7 +111,8 @@ sub main {
 		(!rpm_installed ("mingw-runtime") ||
 		 !rpm_installed ("mingw-w32api"))) {
 		print "rpmbuild -ba bootstrap/mingw-bootstrap.spec\n";
-	        print "as root # rpm -Uvh mingw-bootstrap*.rpm\n"
+	        print "as root # rpm -Uvh mingw-bootstrap*.rpm\n";
+		$installed{"mingw-bootstrap"} = 1;
 	    }
 
 	    # Spec file.