diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-18 13:32:43 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-18 13:32:43 +0000 |
| commit | 5d2c8cbaadfdeadf9341c397400365b0f6136e18 (patch) | |
| tree | 60a9eb5731179f2493bcb18b333c22b21449cf16 | |
| parent | e37fde9a68ecd3c38af14f0ef4ecf4341d593bbe (diff) | |
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.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/rules.mk b/package/rules.mk index d7719ebd0..40e07f839 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 |