From 7243ce0e7a980129e2a82f836f4f53709aba7bef Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 19 Apr 2006 23:56:04 +0000
Subject: more buildroot-ng bugfixes

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3675 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/rules.mk | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'package/rules.mk')

diff --git a/package/rules.mk b/package/rules.mk
index 9f52f17c4..d40d692aa 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -25,7 +25,7 @@ endef
 endef
 
 
-define BuildPackage
+define Package/Default
 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages
@@ -37,7 +37,10 @@ PKGARCH:=$(ARCH)
 PRIORITY:=optional
 TITLE:=
 DESCRIPTION:=
+endef
 
+define BuildPackage
+$$(eval $$(call Package/Default))
 $$(eval $$(call Package/$(1)))
 
 ifeq ($$(TITLE),)
@@ -71,19 +74,21 @@ install-targets: $$(INFO_$(1))
 endif
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
+CONTROLINFO_$(1) = \
+	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \
+	echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \
+	echo "Depends: $$(IDEPEND_$(1))" >> $$(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; \
+	echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \
+	echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \
+	echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \
+	echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control;
 
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
 	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
-	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Description: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
+	$$(CONTROLINFO_$(1))
 	chmod 644 $$(IDIR_$(1))/CONTROL/control
 	for file in conffiles preinst postinst prerm postrm; do \
 		[ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
@@ -102,12 +107,12 @@ clean: $(1)-clean
 
 DUMPINFO += \
 	echo "Package: $(1)"; \
-	echo "Version: $(VERSION)"; \
-	echo "Depends: $(IDEPEND_$(1))"; \
-	echo "Title: $(TITLE)"; \
-	echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+	echo "Version: $$(VERSION)"; \
+	echo "Depends: $$(IDEPEND_$(1))"; \
+	echo "Title: $$(TITLE)"; \
+	echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
 	echo; \
-	echo "$(URL)"; \
+	echo "$$(URL)"; \
 	echo "@@";
 
 PACKAGES += $(1)
-- 
cgit v1.2.3