include package description in menuconfig help

SVN-Revision: 3687

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 5316debca343d73a8d20b12ddfbcb88a420695b4..230b9669bdc42cd1621bd166323a081087aea2c1 100644 (file)
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -117,9 +117,13 @@ DUMPINFO += \
        echo "Depends: $$(IDEPEND_$(1))"; \
        echo "Category: $(CATEGORY)"; \
        echo "Title: $(TITLE)"; \
-       echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+       echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
+ifneq ($(URL),)
+DUMPINFO += \
        echo; \
-       echo "$(URL)"; \
+       echo "$(URL)";
+endif
+DUMPINFO += \
        echo "@@";
 
 

diff --git a/openwrt/scripts/gen_menuconfig.pl b/openwrt/scripts/gen_menuconfig.pl
index 70e31a45f5b419d802c164c5c77e32cc966b9d3d..3f4476a2c6a5a80eac9a11e5ffebd59812d41949 100755 (executable)
--- a/openwrt/scripts/gen_menuconfig.pl
+++ b/openwrt/scripts/gen_menuconfig.pl
@@ -28,6 +28,8 @@ sub print_category($) {
                        foreach my $depend (@{$pkg->{depends}}) {
                                print "\t\tdepends PACKAGE_$depend\n";
                        }
+                       print "\t\thelp\n";
+                       print $pkg->{description};
                        print "\n"
                }
        }
@@ -66,11 +68,11 @@ while ($line = <>) {
                push @{$category{$1}->{$src}}, $pkg;
        };
        $line =~ /^Description: \s*(.*)\s*$/ and do {
-               my $desc = $1;
+               my $desc = "\t\t$1\n\n";
                my $line;
-               while (<>) {
-                       last if /^@@/;
-                       $desc .= $1;
+               while ($line = <>) {
+                       last if $line =~ /^@@/;
+                       $desc .= "\t\t$line";
                }
                $pkg->{description} = $desc;
        }