aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-06-18 13:32:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-06-18 13:32:43 +0000
commit24b125f25c039434c052425cb9c2ff721b443dff (patch)
tree60a9eb5731179f2493bcb18b333c22b21449cf16
parentd0ebac86e0423d08f65817a94dddfc76279092cd (diff)
downloadupstream-24b125f25c039434c052425cb9c2ff721b443dff.tar.gz
upstream-24b125f25c039434c052425cb9c2ff721b443dff.tar.bz2
upstream-24b125f25c039434c052425cb9c2ff721b443dff.zip
fix extra control files for packages containing "." and allow different conffiles for multiple packages built from the same directory
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3985 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/rules.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/rules.mk b/package/rules.mk
index d7719ebd05..40e07f839f 100644
--- a/package/rules.mk
+++ b/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