From owner-cvs-all  Wed Jan 26  9: 3:49 2000
Delivered-To: cvs-all@freebsd.org
Received: from reyim.ne.mediaone.net (reyim.ne.mediaone.net [24.218.254.39])
	by hub.freebsd.org (Postfix) with ESMTP
	id 01BD1151FF; Wed, 26 Jan 2000 09:03:37 -0800 (PST)
	(envelope-from bloom@acm.org)
Received: from acm.org (localhost [127.0.0.1])
	by reyim.ne.mediaone.net (8.9.3/8.9.3) with ESMTP id MAA86710;
	Wed, 26 Jan 2000 12:02:23 -0500 (EST)
	(envelope-from bloom@acm.org)
Message-ID: <388F289F.786698FE@acm.org>
Date: Wed, 26 Jan 2000 12:02:23 -0500
From: Jim Bloom <bloom@acm.org>
Reply-To: bloom@acm.org
X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 4.0-CURRENT i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Sheldon Hearn <sheldonh@uunet.co.za>
Cc: Peter Wemm <peter@netplex.com.au>,
	Yoshinobu Inoue <shin@FreeBSD.ORG>, cvs-committers@FreeBSD.ORG,
	cvs-all@FreeBSD.ORG
Subject: Re: cvs commit: src/lib/libc/net rcmd.c
References: <27407.948905456@axl.noc.iafrica.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

That error was with that untested patch.  The problem is that sys/cam is
linked first followed by sys/cam/scsi.  Since the first link is to the
directory, scsi already exists.  Here is another untested patch based
upon include/Makefile rev 1.107.  The newest changes avoids linking the
subdirectory.  If manually patching on top of Peter's patch, look for
SSUBDIRS.

Jim Bloom
bloom@acm.org


--- include/Makefile.orig       Tue Jan 25 13:27:56 2000
+++ include/Makefile    Wed Jan 26 11:53:18 2000
@@ -37,6 +37,7 @@
 
 # Only for default SHARED=copies case
 SFILES=        soundcard.h joystick.h
+SSUBDIRS= cam/scsi
 
 LFILES=        aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h
syslog.h \
        termios.h ucontext.h
@@ -45,7 +46,7 @@
        netipx netkey netncp netns nfs ntfs nwfs pccard posix4 sys vm
 
 LNOHEADERDIRS= isofs ufs dev
-LSUBDIRS=      isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs cam/scsi dev/usb
+LSUBDIRS=      isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs dev/usb
 
 # Define SHARED to indicate whether you want symbolic links to the
system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks''
is
@@ -100,7 +101,7 @@
 .endfor
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
                -p ${DESTDIR}/usr/include
-.for i in ${LDIRS} ${LSUBDIRS}
+.for i in ${LDIRS} ${LSUBDIRS} ${SSUBDIRS}
        cd ${.CURDIR}/../sys; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
                ${DESTDIR}/usr/include/$i
@@ -116,9 +117,16 @@
 
 symlinks:
        @${ECHO} "Setting up symlinks to kernel source tree..."
-.for i in ${LDIRS} ${LNOHEADERDIRS}
+.for i in ${LDIRS}
        rm -rf ${DESTDIR}/usr/include/$i
        ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
+.endfor
+.for i in ${LNOHEADERDIRS}
+       rm -rf ${DESTDIR}/usr/include/$i
+       mkdir ${DESTDIR}/usr/include/$i
+.endfor
+.for i in ${LSUBDIRS}
+       ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
        rm -rf ${DESTDIR}/usr/include/machine
        ln -s ../../sys/${MACHINE_ARCH}/include
${DESTDIR}/usr/include/machine



Sheldon Hearn wrote:
> 
> On Wed, 26 Jan 2000 11:42:43 EST, Jim Bloom wrote:
> 
> > Peter, I got the following error after doing the following:
> >
> > rm -rf /usr/obj/*
> > make -DNOCLEAN -j8 buildworld
> 
> Peter addressed this on the freebsd-current mailing list.  In his untested
> patch, change
> 
>         ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
> 
> to
> 
>         ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i
> 
> Or wait for a rev 1.108 of src/include/Makefile . :-)
> 
> Ciao,
> Sheldon.


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