Date: Mon, 20 May 2002 13:19:56 +0200 From: Szilveszter Adam <sziszi@bsd.hu> To: freebsd-doc@FreeBSD.ORG Subject: Re: make(1) loops in the doc build Message-ID: <20020520111956.GC607@fonix.adamsfamily.xx> In-Reply-To: <20020512174715.GC613@fonix.adamsfamily.xx> References: <20020512174715.GC613@fonix.adamsfamily.xx>
next in thread | previous in thread | raw e-mail | index | archive | help
--9zSXsLTf0vkW971A Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello y'all, On Sun, May 12, 2002 at 07:47:15PM +0200, Szilveszter Adam wrote: > Hello everybody, > > I noticed today that, even after doing a completely clean new checkout > of the doc and website sources from CVS, the build of the website (or of > any other doc) does highly redundant make(1) loops. <...> OK, I was just about to grumble about the overwhelming response to this mail, when I realised that the reason is that only relatively few people use -CURRENT to build the docs. So, I sat down and fixed it myself. > I suspect that the chages around the /usr/share/mk department are to > blame for this (some file gets included several times, maybe bsd.obj.mk?) This suspicion was correct: changes in bsd.subdir.mk were not coordinated with doc.subdir.mk so now on -CURRENT you either apply my patch, or define NOINCLUDEMK before building. (But the latter may be suboptimal.) So, please find my patch below. But here comes the question: what now? The doc tree is not branched, and neither is doc/share/mk. But here we have a change in bsd.subdir.mk (rev. 1.35) which is only in -CURRENT for the time at least (and there is no MFC after: line in the commit msg): how can we ensure that the change is only applied when needed? (On -STABLE, the original is probably the correct solution). Maybe we should do like in ports and use FreeBSD version to distinguish? Let's discuss. -- Regards: Szilveszter ADAM Szombathely Hungary --9zSXsLTf0vkW971A Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="doc::share::mk::doc.subdir.mk.patch" Index: doc.subdir.mk =================================================================== RCS file: /usr/home/cc/ncvs/freebsd//doc/share/mk/doc.subdir.mk,v retrieving revision 1.9 diff -u -r1.9 doc.subdir.mk --- doc.subdir.mk 13 Dec 2001 23:51:26 -0000 1.9 +++ doc.subdir.mk 20 May 2002 11:08:31 -0000 @@ -62,7 +62,7 @@ .if !target(install) install: afterinstall symlinks afterinstall: realinstall -realinstall: beforeinstall _SUBDIRUSE +realinstall: beforeinstall .endif package: realpackage symlinks --9zSXsLTf0vkW971A-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020520111956.GC607>