diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-07-18 15:31:01 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-07-18 15:31:01 +0000 |
| commit | 1f181fae00a9879130ce21ee28c3035773aba744 (patch) | |
| tree | 0a3568c50b20a8af26ec7ab421fa7a06bff9524a | |
| parent | f30d39b242f6fee6dc93346cc9ee09e32d5c372c (diff) | |
check if the Package/$(NAME) template is defined before packaging or installing ipkg packages
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4144 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/package.mk b/include/package.mk index 7aea314ab..2784cc888 100644 --- a/include/package.mk +++ b/include/package.mk @@ -65,6 +65,7 @@ define Package/Default SECTION:=opt CATEGORY:=Extra packages DEPENDS:= + EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org> SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) ifneq ($(PKG_VERSION),) @@ -113,12 +114,14 @@ define BuildPackage IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list - ifeq ($(CONFIG_PACKAGE_$(1)),y) - install-targets: $$(INFO_$(1)) - endif + ifdef Package/$(1)/install + ifeq ($(CONFIG_PACKAGE_$(1)),y) + install-targets: $$(INFO_$(1)) + endif - ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) - compile-targets: $$(IPKG_$(1)) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + compile-targets: $$(IPKG_$(1)) + endif endif ifeq ($(FORCEREBUILD),y) @@ -182,7 +185,7 @@ define BuildPackage for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ - echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ + echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ ) echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control |