summaryrefslogtreecommitdiffhomepage
path: root/contrib/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-06-11 22:41:32 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-06-11 22:41:32 +0000
commit7add578817b9406700022b60aa75012037bc289a (patch)
tree5735e74b18298c620fbf81fcbc46378c84695d41 /contrib/package
parent7c72d241faf37ae3fdfe3cb997ad75ef8d230a2c (diff)
protocols: merge pptp into ppp, adjust depends for kernel mode pptp
Diffstat (limited to 'contrib/package')
-rw-r--r--contrib/package/luci/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 4420c7ead..1b6945eb5 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -212,10 +212,9 @@ define protocol
endef
$(eval $(call protocol,core,Support for static/dhcp/none))
-$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA))
-$(eval $(call protocol,pptp,Support for PPtP,+pptp))
-$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4))
-$(eval $(call protocol,3g,Support for 3G,+comgt))
+$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
+$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4))
+$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))