fix extra control files for packages containing "." and allow different conffiles...

SVN-Revision: 3985

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index d7719ebd05c85be11260c906d03da79c5793c57f..40e07f839fe2a72a821c60f1ced2b4a43ff96784 100644 (file)
--- 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