rpcd: iwinfo plugin fixes

[openwrt.git] / package / utils / busybox / convert_menuconfig.pl

diff --git a/package/utils/busybox/convert_menuconfig.pl b/package/utils/busybox/convert_menuconfig.pl
index fd99349..7051880 100755 (executable)
--- a/package/utils/busybox/convert_menuconfig.pl
+++ b/package/utils/busybox/convert_menuconfig.pl
@@ -16,9 +16,10 @@ open FIND, "find \"$PATH\" -name Config.in |";
 while (<FIND>) {
        chomp;
        my $input = $_;
-       s/^$PATH\///g;
-       s/sysdeps\/linux\///g;
-       my $output = $_;
+       my $output = $input;
+       my $replace = quotemeta($PATH);
+       $output =~ s/^$replace\///g;
+       $output =~ s/sysdeps\/linux\///g;
        print STDERR "$input => $output\n";
        $output =~ /^(.+)\/[^\/]+$/ and system("mkdir -p $1");
 
@@ -40,7 +41,7 @@ while (<FIND>) {
                        undef $cur;
                        undef $default_set;
                }
-               $line =~ s/^(\s*source\s+)/$1package\/utils\/busybox\/config\//;
+               $line =~ s/^(\s*source\s+)([^\/]+\/)*([^\/]+\/[^\/]+)$/$1$3/;
                if ($line =~ /^(\s*range\s*)(\w+)(\s+)(\w+)\s*$/) {
                        my $prefix = $1;
                        my $r1 = $2;