From owner-freebsd-arch  Fri Jun 22 12:17:47 2001
Delivered-To: freebsd-arch@freebsd.org
Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66])
	by hub.freebsd.org (Postfix) with ESMTP id 181A537B406
	for <arch@freebsd.org>; Fri, 22 Jun 2001 12:17:36 -0700 (PDT)
	(envelope-from imp@harmony.village.org)
Received: from harmony.village.org (localhost.village.org [127.0.0.1])
	by harmony.village.org (8.11.3/8.11.1) with ESMTP id f5MJHZV76094
	for <arch@freebsd.org>; Fri, 22 Jun 2001 13:17:35 -0600 (MDT)
	(envelope-from imp@harmony.village.org)
Message-Id: <200106221917.f5MJHZV76094@harmony.village.org>
To: arch@freebsd.org
Subject: Proposed sys/compile change
Date: Fri, 22 Jun 2001 13:17:35 -0600
From: Warner Losh <imp@harmony.village.org>
Sender: owner-freebsd-arch@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-arch.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-arch>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-arch>
X-Loop: FreeBSD.ORG


There was a thread in hackers@ that suggested that someone put
together patches to move the compile area to sys/compile/MACHINE or
sys/MACHINE/compile.  I chose the latter since it is more orthogonal,
imho, and similar to how otherbsd has done it.  I generally reject the
former since it uglifies things, imho, and has less going for it.

Please comment on my patches.

Warner

Index: sys/conf/Makefile.alpha
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/Makefile.alpha,v
retrieving revision 1.102
diff -u -r1.102 Makefile.alpha
--- sys/conf/Makefile.alpha	2001/06/13 10:58:28	1.102
+++ sys/conf/Makefile.alpha	2001/06/22 19:01:39
@@ -29,7 +29,7 @@
 .if exists(./@/.)
 S=	./@
 .else
-S=	../..
+S=	../../..
 .endif
 .endif
 M=	${MACHINE_ARCH}
Index: sys/conf/Makefile.i386
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/Makefile.i386,v
retrieving revision 1.236
diff -u -r1.236 Makefile.i386
--- sys/conf/Makefile.i386	2001/06/13 10:58:28	1.236
+++ sys/conf/Makefile.i386	2001/06/22 18:47:09
@@ -29,7 +29,7 @@
 .if exists(./@/.)
 S=	./@
 .else
-S=	../..
+S=	../../..
 .endif
 .endif
 M=	${MACHINE_ARCH}
Index: sys/conf/Makefile.ia64
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/Makefile.ia64,v
retrieving revision 1.25
diff -u -r1.25 Makefile.ia64
--- sys/conf/Makefile.ia64	2001/06/13 10:58:28	1.25
+++ sys/conf/Makefile.ia64	2001/06/22 19:02:04
@@ -39,7 +39,7 @@
 .if exists(./@/.)
 S=	./@
 .else
-S=	../..
+S=	../../..
 .endif
 .endif
 M=	${MACHINE_ARCH}
Index: sys/conf/Makefile.pc98
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/Makefile.pc98,v
retrieving revision 1.135
diff -u -r1.135 Makefile.pc98
--- sys/conf/Makefile.pc98	2001/06/13 10:58:28	1.135
+++ sys/conf/Makefile.pc98	2001/06/22 19:01:48
@@ -31,7 +31,7 @@
 .if exists(./@/.)
 S=	./@
 .else
-S=	../..
+S=	../../..
 .endif
 .endif
 M=	${MACHINE_ARCH}
Index: sys/conf/Makefile.powerpc
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/Makefile.powerpc,v
retrieving revision 1.236
diff -u -r1.236 Makefile.powerpc
--- sys/conf/Makefile.powerpc	2001/06/13 10:58:28	1.236
+++ sys/conf/Makefile.powerpc	2001/06/22 19:02:16
@@ -29,7 +29,7 @@
 .if exists(./@/.)
 S=	./@
 .else
-S=	../..
+S=	../../..
 .endif
 .endif
 M=	${MACHINE_ARCH}
Index: usr.sbin/config/config.8
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/usr.sbin/config/config.8,v
retrieving revision 1.26
diff -u -r1.26 config.8
--- usr.sbin/config/config.8	2001/01/22 07:03:06	1.26
+++ usr.sbin/config/config.8	2001/06/22 18:46:38
@@ -110,7 +110,7 @@
 .Fx .
 .Nm
 creates the directory
-.Pa ../../compile/SYSTEM_NAME
+.Pa ../compile/SYSTEM_NAME
 or the one given with the
 .Fl d
 option 
Index: usr.sbin/config/main.c
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/usr.sbin/config/main.c,v
retrieving revision 1.50
diff -u -r1.50 main.c
--- usr.sbin/config/main.c	2001/02/23 00:22:04	1.50
+++ usr.sbin/config/main.c	2001/06/22 18:52:03
@@ -67,7 +67,7 @@
 #define FALSE	(0)
 #endif
 
-#define	CDIR	"../../compile/"
+#define	CDIR	"../compile/"
 
 char *	PREFIX;
 char 	destdir[MAXPATHLEN];
@@ -158,8 +158,7 @@
 	{
 	char xxx[MAXPATHLEN];
 	if (*srcdir == '\0')
-		(void)snprintf(xxx, sizeof(xxx), "../../%s/include",
-		    machinename);
+		(void)snprintf(xxx, sizeof(xxx), "../../include");
 	else
 		(void)snprintf(xxx, sizeof(xxx), "%s/%s/include",
 		    srcdir, machinename);

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