From owner-freebsd-isdn Sat Nov 28 17:52:02 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id RAA08074 for freebsd-isdn-outgoing; Sat, 28 Nov 1998 17:52:02 -0800 (PST) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from ns1.yes.no (ns1.yes.no [195.204.136.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id RAA08069 for ; Sat, 28 Nov 1998 17:52:00 -0800 (PST) (envelope-from eivind@bitbox.follo.net) Received: from bitbox.follo.net (bitbox.follo.net [195.204.143.218]) by ns1.yes.no (8.9.1a/8.9.1) with ESMTP id CAA21538; Sun, 29 Nov 1998 02:51:52 +0100 (CET) Received: (from eivind@localhost) by bitbox.follo.net (8.8.8/8.8.6) id CAA05388; Sun, 29 Nov 1998 02:51:51 +0100 (MET) Message-ID: <19981129025151.O9226@follo.net> Date: Sun, 29 Nov 1998 02:51:51 +0100 From: Eivind Eklund To: Jon Johansen , freebsd-isdn@FreeBSD.ORG Subject: Re: Freebsd 3.0 and the latest i4b References: <000d01be1b36$6e975cf0$640064a0@jon> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.93.2i In-Reply-To: <000d01be1b36$6e975cf0$640064a0@jon>; from Jon Johansen on Sun, Nov 29, 1998 at 02:20:20AM +0100 Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org On Sun, Nov 29, 1998 at 02:20:20AM +0100, Jon Johansen wrote: > When I tried to install the latest i4b it said that > it couldn't find y.tab.h > > I searched the mailing list archive on www.freebsd.org > and found a mail where someone said you had to > rename rc_parse.h in isdnd/ to y.tab.h > I did that, but it still doesn't work. I'll take the freedom of posting the diff from 0.63 to the current Makefile for isdnd (from the developers version). If you apply this, it should solve the problem, I believe (but I have been known to be wrong before). Index: Makefile =================================================================== RCS file: /home/ncvs/yes/intercom/src/sys/i4b-contrib/isdnd/Makefile,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -r1.1.1.3 -r1.1.1.4 --- Makefile 1998/07/21 16:06:51 1.1.1.3 +++ Makefile 1998/11/06 13:32:39 1.1.1.4 @@ -1,29 +1,38 @@ +# Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + .if !defined(BSDTYPE) BSDTYPE!=uname .endif .if !defined(RELEASE) -RELEASE!=uname -r +RELEASE!=expr `uname -r` : '\([.0-9]*[D-Z]*\)' +.endif + +# NEWMK reflects a change in the system makefiles, that affects yacc rules. +.if ${BSDTYPE} == "FreeBSD" && (${RELEASE} == "3.0" || ${RELEASE} == "2.2.8") +NEWMK = YES +.elsif ${BSDTYPE} == "NetBSD" && ${RELEASE} != "1.3" && ${RELEASE} != "1.3.1" && ${RELEASE} != "1.3.2" && ${RELEASE} != "1.3.3" && ${RELEASE} != "1.3.4" +NEWMK = YES +.else +NEWMK = NO .endif PROG = isdnd + SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ process.c rates.c msghdl.c fsm.c support.c timer.c \ - exec.c dial.c monitor.c pcause.c + exec.c dial.c monitor.c pcause.c controller.c alias.c \ + y.tab.h -.if (${BSDTYPE} == "FreeBSD" && ${RELEASE} == "3.0-CURRENT") -SRCS += y.tab.h +.if ${NEWMK} == "NO" +CLEANFILES+= rc_scan.c rc_parse.c y.tab.h y.output y.tab.c .endif -.if (${BSDTYPE} == "NetBSD" || ${BSDTYPE} == "OpenBSD" || \ - ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT") -CLEANFILES+= rc_scan.c rc_parse.c y.tab.h y.output hdr.out isdnd.core -.endif - -COPTS += -I../isdnmonitor +COPTS += -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.OBJDIR} # compile debug support COPTS += -DDEBUG + # enable rtprio usage .if (${BSDTYPE} == "FreeBSD") COPTS += -DUSE_RTPRIO @@ -37,16 +46,19 @@ MAN = isdnd.8 isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 .endif -.if (${BSDTYPE} == "NetBSD" || ${BSDTYPE} == "OpenBSD" || \ - ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT") -rc_scan.c: rc_scan.l y.tab.h -y.tab.h: rc_parse.c -rc_parse.c: rc_parse.y -rc_config.c: y.tab.h +.if (${BSDTYPE} == "NetBSD") +YFLAGS += -d .endif -hdr: - cextract +A +p -P -E -o hdr.out *.c +.if ${NEWMK} == "NO" +${.CURDIR}/rc_parse.c: rc_parse.y +${.CURDIR}/y.tab.h: rc_parse.c +${.CURDIR}/rc_scan.c: rc_scan.l y.tab.h +${.CURDIR}/rc_config.c: y.tab.h + +y.tab.h: + $(YACC) -d ${.CURDIR}/rc_parse.y +.endif .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message