From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Apr 2006 00:50:48 +0000 (+0000)
Subject: include package description in menuconfig help
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a795b4d7bf446f21b4d8daea2d4aa83b6815c52;p=openwrt%2Fstaging%2Fwigyori.git

include package description in menuconfig help

SVN-Revision: 3687
---

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 5316debca3..230b9669bd 100644
--- 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 70e31a45f5..3f4476a2c6 100755
--- 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;
 	}