From 7add578817b9406700022b60aa75012037bc289a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 11 Jun 2012 22:41:32 +0000 Subject: protocols: merge pptp into ppp, adjust depends for kernel mode pptp --- contrib/package/luci/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 4420c7eadc..1b6945eb57 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)) -- cgit v1.2.3