Ignore:
Timestamp:
2010-11-11T20:32:22+01:00 (5 years ago)
Author:
mirko
Message:

[backfire] backport commit 22668 :
Add build variants support to InstallDev

Before building a build variant would have removed the staging files
installed
by the previous build variant from the same makefile.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/include/package.mk

    r19849 r23966  
    2121STAMP_BUILT:=$(PKG_BUILD_DIR)/.built 
    2222STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed 
     23 
     24STAGING_FILES_LIST:=$(PKG_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list 
    2325 
    2426include $(INCLUDE_DIR)/download.mk 
     
    126128        ) 
    127129        if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \ 
    128                 (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \ 
     130                (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \ 
    129131                $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \ 
    130132        fi 
     
    214216        @-(\ 
    215217                cd "$(STAGING_DIR)"; \ 
    216                 if [ -f packages/$(PKG_NAME).list ]; then \ 
    217                         cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \ 
     218                if [ -f packages/$(STAGING_FILES_LIST) ]; then \ 
     219                        cat packages/$(STAGING_FILES_LIST) | xargs -r rm -f 2>/dev/null; \ 
    218220                fi; \ 
    219221        ) 
     
    222224        $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) 
    223225        $(Build/Clean) 
    224         rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list 
     226        rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST) 
    225227        rm -rf $(PKG_BUILD_DIR) 
    226228 
Note: See TracChangeset for help on using the changeset viewer.