X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fmunge-ad.pl;h=f5089a64b897d06be35b0d58eb3fe9aa56596433;hp=12f923dce3b5969b4a37f5fde14f08f40a64ef05;hb=f0261d8acab611f3433160e4f07367b870439739;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05 diff --git a/hacks/munge-ad.pl b/hacks/munge-ad.pl index 12f923dc..f5089a64 100755 --- a/hacks/munge-ad.pl +++ b/hacks/munge-ad.pl @@ -18,7 +18,7 @@ use diagnostics; use strict; my $progname = $0; $progname =~ s@.*/@@g; -my $version = q{ $Revision: 1.3 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/; +my $version = q{ $Revision: 1.4 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/; my $verbose = 0; @@ -85,8 +85,10 @@ sub parse_makefiles() { close IN; $body =~ s/\\\n//gs; - my ($var) = ($body =~ m/^RETIRED_EXES\s*=\s*(.*)$/mi); + my ($var) = ($body =~ m/^RETIRED_EXES\s*=\s*(.*)$/mi); + my ($var2) = ($body =~ m/^RETIRED_GL_EXES\s*=\s*(.*)$/mi); error ("no RETIRED_EXES in $mf") unless $var; + $var .= " $var2" if $var2; foreach my $hack (split (/\s+/, $var)) { $disable{$hack} = 2; }