From owner-p4-projects  Sun Nov 10 12:14:10 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C02537B404; Sun, 10 Nov 2002 12:14:09 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C888A37B401
	for <perforce@freebsd.org>; Sun, 10 Nov 2002 12:14:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 863DF43E3B
	for <perforce@freebsd.org>; Sun, 10 Nov 2002 12:14:08 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAKBtmV062928
	for <perforce@freebsd.org>; Sun, 10 Nov 2002 12:11:55 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAKBt6h062921
	for perforce@freebsd.org; Sun, 10 Nov 2002 12:11:55 -0800 (PST)
Date: Sun, 10 Nov 2002 12:11:55 -0800 (PST)
Message-Id: <200211102011.gAAKBt6h062921@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 20929 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=20929

Change 20929 by jmallett@jmallett_dalek on 2002/11/10 12:11:45

	Remove the symlinking from <platform> to <machine> in userland, as it
	breaks mkioctl, which picks up headers twice then, unless there is a
	real <platform>.

Affected files ...

.. //depot/projects/mips/include/Makefile#7 edit

Differences ...

==== //depot/projects/mips/include/Makefile#7 (text+ko) ====

@@ -101,8 +101,6 @@
 	cd ${.CURDIR}/../sys/${MACHINE_ARCH}/${MACHINE}; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 		${DESTDIR}/usr/include/platform
-.else
-	ln -s machine ${DESTDIR}/usr/include/platform
 .endif
 .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
 	cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
@@ -130,8 +128,6 @@
 	rm -rf ${DESTDIR}/usr/include/platform
 .if ${MACHINE_ARCH} != ${MACHINE} && exists(../../sys/${MACHINE_ARCH}/${MACHINE})
 	ln -s ../../sys/${MACHINE_ARCH}/${MACHINE} ${DESTDIR}/usr/include/platform
-.else
-	ln -s machine ${DESTDIR}/usr/include/platform
 .endif
 	rm -rf ${DESTDIR}/usr/include/machine
 	ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine

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