diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-10-06 00:42:32 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-10-06 01:57:39 +0200 |
| commit | ec041920b7132062a0e459692daf298932c63bdd (patch) | |
| tree | 5637d4bc731c66616c618abaaf578e2110a0abca | |
| parent | cb718eb34bc392bac8d91047d5bebf839fa6a2f5 (diff) | |
| download | upstream-ec041920b7132062a0e459692daf298932c63bdd.tar.gz upstream-ec041920b7132062a0e459692daf298932c63bdd.tar.bz2 upstream-ec041920b7132062a0e459692daf298932c63bdd.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 b8f886bcda..2591f5e7e9 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -133,6 +133,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) @@ -172,6 +173,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) |