$NetBSD: patch-da,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $

Index: Makefile.inc
diff -u /dev/null Makefile.inc
--- /dev/null	Fri Sep 17 20:40:08 1999
+++ Makefile.inc	Fri Sep 26 12:52:08 1997
@@ -0,0 +1,3 @@
+BINDIR=${PREFIX}/sbin
+MANDIR=${PREFIX}/man
+KMODDIR=${PREFIX}/lkm
--- netbsd-1.4/Makefile.top.orig2	Sat Sep 18 11:32:36 1999
+++ netbsd-1.4/Makefile.top	Sat Sep 18 11:33:06 1999
@@ -1,5 +1,5 @@
 #	NetBSD: Makefile,v 1.17 1997/09/26 19:52:08 christos Exp 
 
-SUBDIR=	chat pppd pppstats
+SUBDIR=	chat pppd pppstats netbsd-1.4
 
 .include <bsd.subdir.mk>
--- pppd/Makefile.netbsd-1.4.orig2	Sat Sep 25 17:30:52 1999
+++ pppd/Makefile.netbsd-1.4	Sat Sep 25 17:33:27 1999
@@ -1,13 +1,11 @@
 #	NetBSD: Makefile,v 1.26 1999/08/25 02:07:41 christos Exp 
 
-PCAPDIR=${.CURDIR}/../../../lib/libpcap
 
 PROG=	pppd
 SRCS=	auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c eui64.c fsm.c \
 	ipcp.c ipv6cp.c ipxcp.c lcp.c magic.c main.c options.c sys-bsd.c \
 	upap.c utils.c mppe.c sha1dgst.c extra_crypto.c
 
-.PATH:	${PCAPDIR}
 MAN=	pppd.8
 BINMODE=4555
 BINOWN=	root
@@ -15,7 +13,8 @@
 LDADD=	-lpcap -lcrypt -lutil
 DPADD=	${LIBPCAP} ${LIBCRYPT} ${LIBUTIL}
 CPPFLAGS+= -I. -DHAVE_PATHS_H 
-CPPFLAGS+= -I${PCAPDIR} -DPPP_FILTER
+CPPFLAGS+= -I ${.CURDIR}/../include
+CPPFLAGS+= -DPPP_FILTER
 CPPFLAGS+= -DCBCP_SUPPORT -DCHAPMS -DUSE_CRYPT -DMSLANMAN
 CPPFLAGS+= -DMPPE
 # XXX: Does not work (yet)
--- chat/Makefile.netbsd-1.4.orig2	Sat Sep 25 17:38:55 1999
+++ chat/Makefile.netbsd-1.4	Sat Sep 25 17:39:34 1999
@@ -2,5 +2,6 @@
 
 PROG=	chat
 MAN=	chat.8
+CPPFLAGS+= -I ${.CURDIR}/../include
 
 .include <bsd.prog.mk>
--- pppstats/Makefile.netbsd-1.4.orig2	Sat Sep 25 17:40:19 1999
+++ pppstats/Makefile.netbsd-1.4	Sat Sep 25 17:40:36 1999
@@ -2,5 +2,6 @@
 
 PROG=	pppstats
 MAN=	pppstats.8
+CPPFLAGS+= -I ${.CURDIR}/../include
 
 .include <bsd.prog.mk>