d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install sys/security/lomac/*.h to /usr/include/security/lomac/.

Browse Source 
Install sys/<arch>/include/pc/*.h to /usr/include/machine/pc/.

PR:		docs/29534

Install sys/netatm/*/*.h to /usr/include/netatm/*/.

Don't install compatibility symlinks for <machine/soundcard.h>
and <machine/joystick.h>.  Three years is enough to be aware of
the change, and these weren't visible in the SHARED=symlinks
case.

Back out include/Makefile,v 1.160 that was a null change anyway
due to the bug in the path, and we now don't want to install
these headers because they would otherwise be invisible in the
SHARED=symlinks case.

Don't install IPFILTER headers.  Userland utilities fetch them
directly, and they were not visible in the SHARED=symlinks case.

Resurrect SHARED=symlinks in Makefile.inc1.

PR:		bin/28002

Prodded by:	bde
MFC after:	2 weeks
This commit is contained in:
Ruslan Ermilov 2002-03-26 16:05:14 +00:00
parent 17594b936b
commit 9f1207d517
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93229
6 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -281,7 +281,7 @@ buildworld:
@echo "--------------------------------------------------------------"
@echo ">>> stage 4: populating ${WORLDTMP}/usr/include"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} SHARED=copies includes
cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 4: building libraries"

2
bin/ls/lomac.c
View File

@ -43,7 +43,7 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/lomacio.h>
#include <security/lomac/lomacio.h>
#include <err.h>
#include <fts.h>

2
bin/ps/lomac.c
View File

@ -44,7 +44,7 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/lomacio.h>
#include <security/lomac/lomacio.h>
#include <err.h>
#include <fts.h>

12
etc/mtree/BSD.include.dist
View File

@ -62,12 +62,22 @@
libmilter
..
machine
pc
..
..
net
..
netatalk
..
netatm
ipatm
..
sigpvc
..
spans
..
uni
..
..
netgraph
..
@ -110,6 +120,8 @@
rpcsvc
..
security
lomac
..
..
sys
..

39
include/Makefile
View File

@ -26,16 +26,11 @@ ARPAHDRS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
PROTOHDRS= dumprestore.h routed.h rwhod.h talkd.h timed.h
NETSMBHDRS= nb_lib.h smb_lib.h smb_rap.h
MHDRS= float.h floatingpoint.h stdarg.h varargs.h
# posix4/aio.h conflicts with dysons and isn't installed:
PHDRS= mqueue.h sched.h semaphore.h # aio.h
# Only for default SHARED=copies case
SHDRS= soundcard.h joystick.h
LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
termios.h ucontext.h
@ -43,15 +38,18 @@ LDIRS= cam net netatalk netatm netgraph netinet netinet6 \
netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \
pccard posix4 sys vm
LNOHEADERDIRS= fs isofs ufs dev
LNOHEADERDIRS= dev fs isofs security ufs
LSUBDIRS= cam/scsi dev/ic dev/ppbus dev/usb dev/wi dev/an fs/devfs \
fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
security/lomac \
ufs/ffs ufs/ufs
# For SHARED=symlinks, cam is a symlink, so cam/scsi is taken care of
LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi}
# For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/*
# are taken care of
LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*}
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
@ -113,31 +111,16 @@ copies:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
${DESTDIR}/usr/include/$i
.endfor
.if !defined(NO_IPFILTER)
.if exists(${.CURDIR}/../sys/contrib/ipfilter/netinet)
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}/usr/include/netinet
.endif
.endif
.if exists(${.CURDIR}/../sys/contrib/netsmb/include/netsmb)
cd ${.CURDIR}/../sys/contrib/netsmb/include/netsmb; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${NETSMBHDRS} \
${DESTDIR}/usr/include/netsmb
.endif
.if exists(${.CURDIR}/../sys/security/lomac)
cd ${.CURDIR}/../sys/security/lomac; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 lomac.h \
lomacio.h ${DESTDIR}/usr/include/sys
.endif
.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}/usr/include/machine
.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc)
cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}/usr/include/machine/pc
.endif
.endif
.for i in ${SHDRS}
ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
.endfor
symlinks:
@${ECHO} "Setting up symlinks to kernel source tree..."

2
share/man/man4/joy.4
View File

@ -19,7 +19,7 @@ In
.Cd hint.joy.0.at="isa"
.Cd hint.joy.0.port="0x201"
.Pp
.In machine/joystick.h
.In sys/joystick.h
.Sh DESCRIPTION
The joystick device driver allows applications to read the status of
the PC joystick.