X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9de501aa569d331a6342cca5d3d3347dcc4c32d9..957731ef89fc1876a0ab8c56d50001011b20abb0:/include/package-ipkg.mk diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 2360ac4d4..e0a8118ae 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006,2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -28,8 +28,10 @@ IPKG_BUILD:= \ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg define BuildIPKGVariable +ifdef Package/$(1)/$(2) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2); + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); +endif endef PARENL :=( @@ -69,7 +71,7 @@ ifeq ($(DUMP),) endif IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS)) - + $(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),preinst)) $(eval $(call BuildIPKGVariable,$(1),postinst)) @@ -89,7 +91,7 @@ ifeq ($(DUMP),) @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1)) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(call Package/$(1)/install,$$(IDIR_$(1))) - -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf + -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf $(RSTRIP) $$(IDIR_$(1)) ( \ echo "Package: $(1)"; \ @@ -111,7 +113,7 @@ ifeq ($(DUMP),) echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ ) > $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control - (cd $$(IDIR_$(1))/CONTROL; \ + $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ ) @@ -121,7 +123,7 @@ ifeq ($(DUMP),) for x in $$(KEEP_$(1)); do \ [ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \ done; \ - [ -z "$keepfiles" ] || { \ + [ -z "$$$$keepfiles" ] || { \ mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \ for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \ }; \