From: Paul Mackerras <paulus@ozlabs.org>
Date: Fri, 26 Nov 2021 00:05:06 +0000 (+1100)
Subject: Merge branch 'pppoe-discovery' of https://github.com/pali/ppp
X-Git-Tag: ppp-2.5.0~50
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=032020241d270c53dff479a7b0eb7fe487c56a78

Merge branch 'pppoe-discovery' of https://github.com/pali/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

032020241d270c53dff479a7b0eb7fe487c56a78
diff --cc pppd/plugins/pppoe/Makefile.am
index e3c01cd,0000000..0d70380
mode 100644,000000..100644
--- a/pppd/plugins/pppoe/Makefile.am
+++ b/pppd/plugins/pppoe/Makefile.am
@@@ -1,14 -1,0 +1,14 @@@
 +pppd_plugin_LTLIBRARIES = pppoe.la 
 +pppd_plugindir = $(PPPD_PLUGIN_DIR)
 +sbin_PROGRAMS = pppoe-discovery
 +dist_man8_MANS = pppoe-discovery.8
 +
 +noinst_HEADERS = \
 +    pppoe.h
 +
 +pppoe_la_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
 +pppoe_la_LDFLAGS = -module -avoid-version
 +pppoe_la_SOURCES = plugin.c discovery.c if.c common.c
 +
 +pppoe_discovery_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
- pppoe_discovery_SOURCES = pppoe-discovery.c debug.c
++pppoe_discovery_SOURCES = pppoe-discovery.c discovery.c if.c common.c