From 68b9a0b76bfb2e90638239c5bd4c0a47b479e987 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 18 Jun 2006 13:32:43 +0000 Subject: [PATCH] fix extra control files for packages containing "." and allow different conffiles for multiple packages built from the same directory SVN-Revision: 3985 --- openwrt/package/rules.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk index d7719ebd05..40e07f839f 100644 --- a/openwrt/package/rules.mk +++ b/openwrt/package/rules.mk @@ -78,9 +78,9 @@ define Package/Default endef define BuildIPKGVariable -pkg_$(subst -,_,$(1))_$(2) = $$(Package/$(1)/$(2)) -export pkg_$(subst -,_,$(1))_$(2) -COMMANDS += if [ -n "$$$$$$$$pkg_$(subst -,_,$(1))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst -,_,$(1))_$(2)" > $(2); fi; +pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) +export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) +$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; endef define BuildPackage @@ -175,7 +175,7 @@ define BuildPackage echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control (cd $$(IDIR_$(1))/CONTROL; \ - $(COMMANDS) \ + $($(1)_COMMANDS) \ ) $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built -- 2.30.2