diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-10-06 03:07:05 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-10-06 03:07:05 +0200 |
| commit | 8bd198f171b76b834e1462e1789ae060a42d983e (patch) | |
| tree | 0b63f1b28284ae91e2198795caf85608e8ef93ac | |
| parent | 8c658e15cc162c46c18dfc5b4b65be9ed03a9fb1 (diff) | |
| download | master-187ad058-8bd198f171b76b834e1462e1789ae060a42d983e.tar.gz master-187ad058-8bd198f171b76b834e1462e1789ae060a42d983e.tar.bz2 master-187ad058-8bd198f171b76b834e1462e1789ae060a42d983e.zip | |
include/package-ipkg.mk: use TARGET_PATH_PKG in Package/*/install steps
Package/*/install was using a different PATH than all other steps like
Build/Install, which was confusing and easily led to mistakes.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
| -rw-r--r-- | include/package-ipkg.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index eb4c874047..f06b651e07 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -131,6 +131,7 @@ ifeq ($(DUMP),) $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1)) $(eval $(call BuildIPKGVariable,$(1),postrm,,1)) + $(STAGING_DIR_ROOT)/stamp/.$(1)_installed : export PATH=$$(TARGET_PATH_PKG) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1) @@ -170,6 +171,7 @@ $(_endef) $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1)) $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) + $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk @rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1)) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) |