Greg A. Woods wrote:

> [ On Saturday, June 23, 2001 at 01:08:21 (+0100), prlw1@cam.ac.uk wrote: ]
> > Subject: bin/13285: bsd.sys.mk/MKSOFTFLOAT
> >
> > >Fix:
> 
> I've now tested this fix, and I think it's potentially more "correct" as
> it preserves the intent of the use of MKSOFTFLOAT.
> 
> Index: bsd.sys.mk
> ===================================================================
> RCS file: /cvs/NetBSD/src/share/mk/bsd.sys.mk,v
> retrieving revision 1.1.1.9
> diff -c -c -r1.1.1.9 bsd.sys.mk
> *** bsd.sys.mk	2001/06/19 18:59:00	1.1.1.9
> --- bsd.sys.mk	2001/06/21 21:44:18
> ***************
> *** 2,7 ****
> --- 2,12 ----
>   #
>   # Overrides used for NetBSD source tree builds.
>   
> + .if !target(__bsd.sys.mk-initialized__)
> + __bsd.sys.mk-initialized__:
> + .include <bsd.own.mk>
> + .endif
> + 
>   .if defined(WARNS)
>   .if ${WARNS} > 0
>   CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith


Index: bsd.sys.mk
===================================================================
RCS file: /cvsroot/sharesrc/share/mk/bsd.sys.mk,v
retrieving revision 1.47
diff -d -p -u -r1.47 bsd.sys.mk
--- bsd.sys.mk	2001/06/18 17:04:45	1.47
+++ bsd.sys.mk	2001/06/25 03:53:21
@@ -2,6 +2,15 @@
 #
 # Overrides used for NetBSD source tree builds.
 
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
+.include <bsd.own.mk>
+.MAIN:		all
+.endif
+
 .if defined(WARNS)
 .if ${WARNS} > 0
 CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith

follows that the other *.mk files appear to do.  Is there any reason
to be different in for the bsd.sys.mk case?  I haven't yet finished a
"make release" on a non-MKSOFTFLOAT system yet though...

> Oh, and while I'm here, this is pretty handy for some of us too...
> 
> ***************
> *** 54,60 ****
>   
>   OBJCOPY?=	objcopy
>   STRIP?=		strip
> ! CONFIG?=	config
>   RPCGEN?=	rpcgen
>   MKLOCALE?=	mklocale
>   
> --- 59,65 ----
>   
>   OBJCOPY?=	objcopy
>   STRIP?=		strip
> ! CONFIG?=	/usr/sbin/config
>   RPCGEN?=	rpcgen
>   MKLOCALE?=	mklocale

How does hard-coding the path to config(8) and not other binaries help
out?  I'm don't understand the reasons for this suggested change...

Simon.
--
Simon Burge                            <simonb@wasabisystems.com>
NetBSD CDs, Support and Service:    http://www.wasabisystems.com/