X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d7522f1c22c7ec2cbdb09b8db88dd734c1e0cabf..cf57ed1e80d62dacfda0c0441f02ccb9d1e7db92:/include/package.mk diff --git a/include/package.mk b/include/package.mk index 712b793d0..580774134 100644 --- a/include/package.mk +++ b/include/package.mk @@ -75,10 +75,6 @@ define Download/default MD5SUM:=$(PKG_MD5SUM) endef -define sep - -endef - define Build/Exports/Default $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p)) $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr @@ -132,8 +128,9 @@ define Build/DefaultTargets $(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\ ) if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \ + (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_NAME).files); \ $(call locked, \ - (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \ + mv $(TMP_DIR)/stage-$(PKG_NAME).files $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) && \ $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \ ,staging-dir); \ fi