From owner-freebsd-current  Thu Jan 27  7: 1:51 2000
Delivered-To: freebsd-current@freebsd.org
Received: from relay.ucb.crimea.ua (UCB-Async4-CRISCO.CRIS.NET [212.110.129.130])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1AF2114A21; Thu, 27 Jan 2000 07:01:11 -0800 (PST)
	(envelope-from ru@ucb.crimea.ua)
Received: (from ru@localhost)
	by relay.ucb.crimea.ua (8.9.3/8.9.3/UCB) id RAA59969;
	Thu, 27 Jan 2000 17:00:58 +0200 (EET)
	(envelope-from ru)
Date: Thu, 27 Jan 2000 17:00:58 +0200
From: Ruslan Ermilov <ru@FreeBSD.org>
To: Peter Wemm <peter@FreeBSD.org>
Cc: current@FreeBSD.org
Subject: src/include/Makefile,v 1.109 is broken
Message-ID: <20000127170058.A57120@relay.ucb.crimea.ua>
Mail-Followup-To: Peter Wemm <peter@FreeBSD.org>, current@FreeBSD.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary=opJtzjQTFsWo+cga
X-Mailer: Mutt 0.95.3i
X-Operating-System: FreeBSD 3.3-STABLE i386
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


--opJtzjQTFsWo+cga
Content-Type: text/plain; charset=us-ascii

The latest src/include/Makefile,v 1.109 is broken.

You will see what is spammed by executing the following:
cd /usr/src/include; make symlinks copies DESTDIR=/FOO

There should be no symlinked dirs in /FOO/usr/include
after that, but...

The idea was that `copies' should first undo all the
things `symlinks' did, but it is broken now.

An attached patch seems to fix the problem.

-- 
Ruslan Ermilov		Sysadmin and DBA of the
ru@ucb.crimea.ua	United Commercial Bank,
ru@FreeBSD.org		FreeBSD committer,
+380.652.247.647	Simferopol, Ukraine

http://www.FreeBSD.org	The Power To Serve
http://www.oracle.com	Enabling The Information Age

--opJtzjQTFsWo+cga
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p

Index: src/include/Makefile
===================================================================
RCS file: /usr/FreeBSD-CVS/src/include/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile	2000/01/26 17:38:51	1.109
+++ Makefile	2000/01/27 14:51:05
@@ -96,10 +96,13 @@ beforeinstall: ${SHARED}
 .endfor
 
 copies:
-.for i in ${LDIRS} ${LNOHEADERDIRS} machine
+.for i in ${LDIRS} ${LSYMSUBDIRS} machine
 	if [ -h ${DESTDIR}/usr/include/$i ]; then \
 		rm -f ${DESTDIR}/usr/include/$i; \
 	fi
+.endfor
+.for i in ${LNOHEADERDIRS}
+	rm -rf ${DESTDIR}/usr/include/$i
 .endfor
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include

--opJtzjQTFsWo+cga--


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