X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=45f6d7e34fb4a7b3fe297105509863e0b845e177;hp=1fad581227e167ad07ad64a884f7b9c09b8b1242;hb=b2f7664779840eca0c314a4cd035e6af7c500bf9;hpb=d3c546bf5324f10f4fb176f873ab177f8e585408 diff --git a/AutoGen.pm b/AutoGen.pm index 1fad581..45f6d7e 100644 --- a/AutoGen.pm +++ b/AutoGen.pm @@ -159,7 +159,7 @@ my($class,%args)=@_; $spec=~s/\\\n/ /gs; $class->run(%Options, "ARGV"=>["--copy"], - "configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]], + "configure_args"=>[split /\s+/,($spec=~/^[%]configure\b[ \t]*(.*)$/m)[0]], ); _remove "ChangeLog"; # force its rebuild by Makefile/rcs2log _system "make dist $name.spec"; @@ -333,8 +333,10 @@ sub _expandclass my($patt)=@_; return $patt if $patt!~/\Q[\E(.*?)\Q]\E/; - my($pre,$post)=($`,$'); # FIXME: local($`,$') doesn't work - why? - return map({ _expandclass("$pre$_$post"); } split("",$1)); + my($pre,$range,$post)=($`,$1,$'); # FIXME: local($`,$1,$') doesn't work - why? + 1 while $range=~s#(.)-(.)# join("",map(chr,(ord($1)..ord($2)))); + #ge; + return map({ _expandclass("$pre$_$post"); } split("",$range)); } sub run