From owner-freebsd-current Sat May 4 17: 4:18 2002 Delivered-To: freebsd-current@freebsd.org Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16]) by hub.freebsd.org (Postfix) with ESMTP id 1D52237B445; Sat, 4 May 2002 17:04:00 -0700 (PDT) Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102]) by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id KAA24845; Sun, 5 May 2002 10:03:38 +1000 Date: Sun, 5 May 2002 10:05:18 +1000 (EST) From: Bruce Evans X-X-Sender: bde@gamplex.bde.org To: "Kenneth D. Merry" Cc: Ruslan Ermilov , , , Subject: Re: cvs commit: src/share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk bsd.init.mk bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk sys.mk In-Reply-To: <20020503220935.A17720@panzer.kdm.org> Message-ID: <20020505095658.W710-100000@gamplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, Kenneth D. Merry wrote: > On Fri, May 03, 2002 at 22:00:05 -0600, Kenneth D. Merry wrote: > > The attached patch "fixes" it for me. > > > > I'm sure someone can come up with a cleaner way of fixing the problem. It doesn't seem to be very easy to fix. Kernel makefiles should not depend on anything outside of the kernel tree. Depending on bsd.kern.mk is bad enough. > Sorry, it was this commit that broke building -current kernels on -stable: > > ru 2002/04/22 08:47:11 PDT > > Modified files: > sys/conf kmod.mk > Log: > Use standard bsd.init.mk prologue. > > Revision Changes Path > 1.116 +1 -7 src/sys/conf/kmod.mk > > > ==== //depot/FreeBSD-zero/src/sys/conf/kmod.mk#9 - /usr/home/ken/perforce/FreeBSD-zero/src/sys/conf/kmod.mk ==== > > *** /tmp/tmp.18430.0 Fri May 3 21:51:56 2002 > > --- /usr/home/ken/perforce/FreeBSD-zero/src/sys/conf/kmod.mk Fri May 3 21:51:43 2002 > > *************** > > *** 86,92 **** > > --- 86,98 ---- > > .error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" > > .endif > > > > + .if exists(____) It will never exist when it has 2 layers of misspelling like this :-). > > .include > > + .elif exists(../../../share/mk/bsd.init.mk) > > + .include "../../../share/mk/bsd.init.mk" > > + .elif exists(../../../../share/mk/bsd.init.mk) > > + .include "../../../../share/mk/bsd.init.mk" > > + .endif > > > > .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S > > Not using it when it isn't in the standard place would be less ugly. Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message