From f526c532b2d8b28c3039beff37420fa4f116de59 Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Fri, 19 Oct 2001 22:57:53 +0000
Subject: [PATCH] "YFLAGS=-d" causes inconsistent parallelism behavior. 
 Instead, use the NetBSD standard YHEADER and #include "rc_parse.h".

---
 usr.sbin/isdn/isdnd/Makefile    | 5 ++---
 usr.sbin/isdn/isdnd/rc_config.c | 4 ++--
 usr.sbin/isdn/isdnd/rc_scan.l   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/isdn/isdnd/Makefile b/usr.sbin/isdn/isdnd/Makefile
index 5142bc08df86..60ff4834be85 100644
--- a/usr.sbin/isdn/isdnd/Makefile
+++ b/usr.sbin/isdn/isdnd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2001/01/10 18:11:05 thorpej Exp $
+#	$NetBSD: Makefile,v 1.4 2001/10/19 22:57:53 tv Exp $
 
 PROG	=	isdnd
 SRCS	=	rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c	\
@@ -14,8 +14,7 @@ CPPFLAGS+=	-DDEBUG
 MAN      =	isdnd.8 isdnd.rc.5 isdnd.rates.5 isdnd.acct.5
 
 LDADD+=-ly -ll
-YFLAGS += -d
-CLEANFILES+=	y.tab.h
+YHEADER=1
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/isdn/isdnd/rc_config.c b/usr.sbin/isdn/isdnd/rc_config.c
index a3731e7fc663..4ea02b245b34 100644
--- a/usr.sbin/isdn/isdnd/rc_config.c
+++ b/usr.sbin/isdn/isdnd/rc_config.c
@@ -27,7 +27,7 @@
  *	i4b daemon - config file processing
  *	-----------------------------------
  *
- *	$Id: rc_config.c,v 1.3 2001/04/09 21:18:00 martin Exp $ 
+ *	$Id: rc_config.c,v 1.4 2001/10/19 22:57:54 tv Exp $ 
  *
  * $FreeBSD$
  *
@@ -44,7 +44,7 @@
 #include <sys/ioctl.h>
 
 #include "isdnd.h"
-#include "y.tab.h"
+#include "rc_parse.h"
 
 #include "monitor.h"
 
diff --git a/usr.sbin/isdn/isdnd/rc_scan.l b/usr.sbin/isdn/isdnd/rc_scan.l
index f74c0c61e6b3..8ee7e6120379 100644
--- a/usr.sbin/isdn/isdnd/rc_scan.l
+++ b/usr.sbin/isdn/isdnd/rc_scan.l
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration lexical analyzer
  *	---------------------------------------------------
  *
- *	$Id: rc_scan.l,v 1.2 2001/01/07 21:01:03 martin Exp $ 
+ *	$Id: rc_scan.l,v 1.3 2001/10/19 22:57:54 tv Exp $ 
  *
  * $FreeBSD$
  *
@@ -47,7 +47,7 @@
 #include <ctype.h>
 #include <sysexits.h>
 
-#include "y.tab.h"
+#include "rc_parse.h"
 
 int lineno;
 void reset_scanner(FILE *infile);