From owner-cvs-gnu Mon Jan 13 03:01:29 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id DAA05805 for cvs-gnu-outgoing; Mon, 13 Jan 1997 03:01:29 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.4/8.8.4) with ESMTP id DAA05800; Mon, 13 Jan 1997 03:01:25 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.4/8.6.9) with ESMTP id DAA23436; Mon, 13 Jan 1997 03:01:13 -0800 (PST) To: Bruce Evans cc: cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/texinfo/install-info Makefile In-reply-to: Your message of "Mon, 13 Jan 1997 21:25:54 +1100." <199701131025.VAA15118@godzilla.zeta.org.au> Date: Mon, 13 Jan 1997 03:01:11 -0800 Message-ID: <23432.853153271@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-gnu@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > Er, it's done in /usr/share/info. Since texinfo is bootstrapped and > the dir file isn't, the build always falls over at texinfo if the dir > file doesn't exist. Erm, OK - the light of comprehension now dawns. Feh. I can fix this in bsd.info.mk, but it's going to take a gross direct reference to /usr/src/share/info, e.g.: --- bsd.info.mk 1997/01/12 16:20:13 1.27 +++ bsd.info.mk 1997/01/13 10:51:01 @@ -109,9 +109,13 @@ ${GZIPCMD} -c ${.ALLSRC} > ${.TARGET} .endfor +# What to do if there's no dir file there. This is really gross!!! +${DESTDIR}${INFODIR}/${INFODIRFILE}: + @(cd /usr/src/share/info; make install) + .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} -${x:S/$/-install/}: +${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE} ${INSTALLINFO} --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} Unless you've got any brighter ideas? Jordan