From owner-freebsd-current  Wed Mar 15  7:49:12 2000
Delivered-To: freebsd-current@freebsd.org
Received: from ns1.sunesi.net (ns1.sunesi.net [196.15.192.194])
	by hub.freebsd.org (Postfix) with ESMTP id 4806F37BA69
	for <current@freebsd.org>; Wed, 15 Mar 2000 07:49:08 -0800 (PST)
	(envelope-from nbm@sunesi.net)
Received: from nbm by ns1.sunesi.net with local (Exim 3.03 #1)
	id 12VG2k-000EAw-00
	for current@FreeBSD.org; Wed, 15 Mar 2000 17:49:06 +0200
Date: Wed, 15 Mar 2000 17:49:06 +0200
From: Neil Blakey-Milner <nbm@mithrandr.moria.org>
To: current@FreeBSD.org
Subject: possible simple install-info fix
Message-ID: <20000315174906.A54067@mithrandr.moria.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0pre2i
Organization: Sunesi Clinical Systems
X-Operating-System: FreeBSD 3.3-RELEASE i386
X-URL: http://rucus.ru.ac.za/~nbm/
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Hi,

I was looking into fixing the install-info problem, and wondered if the
solution is really as easy as it seems:

cvs diff: Diffing src
Index: src/Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.141
diff -u -r1.141 Makefile.inc1
--- Makefile.inc1	2000/03/09 06:28:19	1.141
+++ Makefile.inc1	2000/03/15 15:34:25
@@ -183,7 +183,7 @@
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1
 
 # install stage
-IMAKEENV=	${CROSSENV}
+IMAKEENV=	${CROSSENV} INSTALLINFO="${WORLDTMP}/usr/bin/install-info"
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1
 
 USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \

I've done an installworld between -CURRENTs (where we wouldn't
encounter the problem anyway) and it used the correct install-info.

If anyone is willing to test an upgrade from 3.4 -> 4.0 with this
fix, I'd appreciate it.  Otherwise, I'll do it tomorrow.

If we happen to slide tags and make a new release, this'd be great
for cvsup upgrade path to the release.

Neil
-- 
Neil Blakey-Milner
nbm@rucus.ru.ac.za


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message