Changeset 4144


Ignore:
Timestamp:
2006-07-18T17:31:01+02:00 (12 years ago)
Author:
nbd
Message:

check if the Package/$(NAME) template is defined before packaging or installing ipkg packages

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/include/package.mk

    r4124 r4144  
    6666  CATEGORY:=Extra packages 
    6767  DEPENDS:= 
     68  EXTRA_DEPENDS:= 
    6869  MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org> 
    6970  SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) 
     
    114115  INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list 
    115116 
    116   ifeq ($(CONFIG_PACKAGE_$(1)),y) 
    117     install-targets: $$(INFO_$(1)) 
    118   endif 
    119  
    120   ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) 
    121     compile-targets: $$(IPKG_$(1)) 
     117  ifdef Package/$(1)/install 
     118    ifeq ($(CONFIG_PACKAGE_$(1)),y) 
     119      install-targets: $$(INFO_$(1)) 
     120    endif 
     121 
     122    ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) 
     123      compile-targets: $$(IPKG_$(1)) 
     124    endif 
    122125  endif 
    123126 
     
    183186                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ 
    184187                done; \ 
    185                 echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ 
     188                echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ 
    186189        ) 
    187190        echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control 
Note: See TracChangeset for help on using the changeset viewer.