aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-07-21 22:48:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-07-21 22:48:58 +0000
commit8b57a39417824f6358d370619bd0a04818a1a422 (patch)
treea66febee633e165f2e87b9845a6f2a736bcd4b90
parent17dad6fbd266df1c60e536828d28adaf414386f3 (diff)
downloadupstream-8b57a39417824f6358d370619bd0a04818a1a422.tar.gz
upstream-8b57a39417824f6358d370619bd0a04818a1a422.tar.bz2
upstream-8b57a39417824f6358d370619bd0a04818a1a422.zip
fix menu/submenu nesting
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4200 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xscripts/gen_menuconfig.pl21
1 files changed, 13 insertions, 8 deletions
diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index ddce86bfa1..fe01310928 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -15,6 +15,17 @@ my %category;
my $cur_menu;
my $cur_menu_dep;
+sub close_submenu {
+ if ($cur_menu) {
+ print "endmenu\n";
+ $cur_menu_dep and do {
+ print "endif\n";
+ $cur_menu_dep = undef;
+ };
+ undef $cur_menu;
+ }
+}
+
sub print_category($) {
my $cat = shift;
@@ -25,14 +36,7 @@ sub print_category($) {
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
foreach my $pkg (@{$spkg{$spkg}}) {
if ($cur_menu ne $pkg->{submenu}) {
- if ($cur_menu) {
- print "endmenu\n";
- $cur_menu_dep and do {
- print "endif\n";
- $cur_menu_dep = undef;
- };
- undef $cur_menu;
- }
+ close_submenu();
if ($pkg->{submenu}) {
$cur_menu = $pkg->{submenu};
$cur_menu_dep = $pkg->{submenudep} and print "if $cur_menu_dep\n";
@@ -66,6 +70,7 @@ sub print_category($) {
$pkg->{config} and print $pkg->{config}."\n";
}
}
+ close_submenu();
print "endmenu\n\n";
undef $category{$cat};