From 0f3c41f3c499ec82981ec73713aa92efdc5fc01d Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 29 Jan 2004 01:56:05 +0000 Subject: [PATCH] Add back a directory path that buildworld needs, remove /usr/libexec/gcc2 from mtree. --- Makefile.inc1 | 8 +++++--- etc/mtree/BSD.usr.dist | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 850a2a08c8..84a3553211 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.15 2004/01/28 16:41:16 joerg Exp $ +# $DragonFly: src/Makefile.inc1,v 1.16 2004/01/29 01:56:04 dillon Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -222,8 +222,10 @@ USRDIRS= usr/bin usr/bin/gcc2 usr/bin/gcc3 \ usr/lib/compat/aout usr/games \ usr/libdata/gcc2 usr/libdata/gcc2/ldscripts \ usr/libdata/gcc3 usr/libdata/gcc3/ldscripts \ - usr/libexec/gcc2 usr/libexec/gcc3 \ - usr/libexec/binutils212/${OBJFORMAT} \ + usr/libexec/gcc3 \ + usr/libexec/binutils212/ \ + usr/libexec/binutils212/elf \ + usr/libexec/binutils212/aout \ usr/sbin usr/share/misc \ usr/share/dict \ usr/share/groff_font/devX100 \ diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 834a77985d..c569914e39 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $ -# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.7 2004/01/28 16:41:16 joerg Exp $ +# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.8 2004/01/29 01:56:05 dillon Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -163,8 +163,6 @@ elf .. .. - gcc2 - .. gcc3 .. lpr -- 2.41.0