From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 28 May 2006 22:58:07 +0000 (+0000)
Subject: add dependencies from the NEEDS variable to ipkg/control
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=139852b0f80aa24acf3fa9b8044478ece077c25c;p=openwrt%2Fstaging%2Fyousong.git

add dependencies from the NEEDS variable to ipkg/control

SVN-Revision: 3831
---

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 4999974900..9b551728b3 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -134,7 +134,8 @@ define BuildPackage
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
+	#FIXME: there should be a better way to do it
+	D="$$(IDEPEND_$(1))"; D="$$$${D}$$$${D:+, }$$(INEED_$(1))"; echo "Depends: $$$${D}" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control