summaryrefslogtreecommitdiffhomepage
path: root/contrib
diff options
context:
space:
mode:
authorDaniel Dickinson <daniel@cshore.neomailbox.net>2009-08-18 08:37:29 +0000
committerDaniel Dickinson <daniel@cshore.neomailbox.net>2009-08-18 08:37:29 +0000
commitf12f7c5b5ad36b07f5cb73200625fb49704791d7 (patch)
tree12080ada74ebab5d5b083b0c90de7a05abdc8e1a /contrib
parent552fbe241c3d261748930b0f7f5a3249216b8e8a (diff)
Make luci-app-diag and friends use conditional dependencies
Diffstat (limited to 'contrib')
-rw-r--r--contrib/package/luci/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 9b05557dfb..2823d7d45b 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -532,25 +532,32 @@ endef
define Package/luci-app-diag-core
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-core
+ DEPENDS+=+PACKAGE_luci-app-diag-core:luci-admin-core
TITLE:=LuCI Diagnostics Tools (Core)
endef
define Package/luci-app-diag-devinfo
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-app-diag-core +smap +netdiscover +mac-to-devinfo +httping +smap-to-devinfo +netdiscover-to-devinfo
+ DEPENDS+=+PACKAGE_luci_app-diag-devinfo:luci-app-diag-core \
+ +PACKAGE_luci-app-diag-devinfo:smap \
+ +PACKAGE_luci-app-diag-devinfo:netdiscover \
+ +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \
+ +PACKAGE_luci-app-diag-devinfo:httping \
+ +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \
+ +PACAKGE_luci-app-diag-devinfo:netdiscover-to-devinfo
TITLE:=LuCI Diagnostics Tools (Device Info)
endef
define Package/luci-app-voice-core
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-core
+ DEPENDS+=+PACKAGE_luci-app-voice-core:luci-admin-core
TITLE:=LuCI Voice Software (Core)
endef
define Package/luci-app-voice-diag
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-app-voice-core +luci-app-diag-devinfo
+ DEPENDS+=+PACKAGE_luci-app-voice-diag:luci-app-voice-core \
+ +PACKAGE_luci-apps-voice-diag:luci-app-diag-devinfo
TITLE:=LuCI Voice Software (Diagnostics)
endef