From owner-freebsd-current  Wed Jul 29 12:17:32 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA07542
          for freebsd-current-outgoing; Wed, 29 Jul 1998 12:17:32 -0700 (PDT)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from rover.village.org (rover.village.org [204.144.255.49])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id MAA07529
          for <current@freebsd.org>; Wed, 29 Jul 1998 12:17:29 -0700 (PDT)
          (envelope-from imp@village.org)
Received: from harmony [10.0.0.6] 
	by rover.village.org with esmtp (Exim 1.71 #1)
	id 0z1bia-00031j-00; Wed, 29 Jul 1998 13:16:56 -0600
Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.8.8/8.8.3) with ESMTP id NAA12977; Wed, 29 Jul 1998 13:20:47 -0600 (MDT)
Message-Id: <199807291920.NAA12977@harmony.village.org>
To: nik@iii.co.uk
Subject: Re: Upgrading from 2.2.7 to Current 
Cc: wwoods@cybcon.com, current@FreeBSD.ORG
In-reply-to: Your message of "Wed, 29 Jul 1998 09:48:49 BST."
		<19980729094849.A9484@iii.co.uk> 
References: <19980729094849.A9484@iii.co.uk>  <XFMail.980729011753.wwoods@cybcon.com> 
Date: Wed, 29 Jul 1998 13:20:46 -0600
From: Warner Losh <imp@village.org>
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

In message <19980729094849.A9484@iii.co.uk> nik@iii.co.uk writes:
:     # make buildworld

This should be all that is needed, the -m xxxx stuff is a workaround
for a bug in Makefile.

If there are people out there with 2.2.x or 2.1.x systems that have
-current trees laying around, can you please take a look at the patch
that I've attached to this message and see if it restores the ability
to go from 2.x -> -current?  I think, but am not sure, that the XMAKE
variable doesn't need to be tweaked.  I could be wrong, however.

Thanks Much

Warner

Index: Makefile
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/Makefile,v
retrieving revision 1.205
diff -u -r1.205 Makefile
--- Makefile	1998/07/07 09:59:48	1.205
+++ Makefile	1998/07/29 18:37:26
@@ -39,9 +39,11 @@
 #		obj depend all install clean cleandepend cleanobj
 
 .if (!make(world)) && (!make(buildworld)) && (!make(installworld))
-.MAKEFLAGS:=	-m ${.CURDIR}/share/mk ${.MAKEFLAGS}
+.MAKEFLAGS:=   -m ${.CURDIR}/share/mk ${.MAKEFLAGS}
 .endif
 
+MACHINE_ARC?=${MACHINE}
+
 # Put initial settings here.
 SUBDIR=
 
@@ -220,7 +222,7 @@
 MAKETMP=	${WORLDTMP}/make
 IBMAKE=	${BMAKEENV} MAKEOBJDIR=${MAKETMP} ${MAKE} DESTDIR=${WORLDTMP}
 # bootstrap make
-BMAKE=	${BMAKEENV} ${WORLDTMP}/usr/bin/make DESTDIR=${WORLDTMP}
+BMAKE=	${BMAKEENV} ${WORLDTMP}/usr/bin/make -m ${.CURDIR}/share/mk DESTDIR=${WORLDTMP}
 # cross make used for compilation
 XMAKE=	${XMAKEENV} ${WORLDTMP}/usr/bin/make DESTDIR=${WORLDTMP}
 # cross make used for final installation

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