diff options
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | bin/ls/lomac.c | 2 | ||||
| -rw-r--r-- | bin/ps/lomac.c | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.include.dist | 12 | ||||
| -rw-r--r-- | include/Makefile | 39 | ||||
| -rw-r--r-- | share/man/man4/joy.4 | 2 |
6 files changed, 27 insertions, 32 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6ba1b12..17bc00a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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" diff --git a/bin/ls/lomac.c b/bin/ls/lomac.c index 0f3132a..ff3b0bf 100644 --- a/bin/ls/lomac.c +++ b/bin/ls/lomac.c @@ -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> diff --git a/bin/ps/lomac.c b/bin/ps/lomac.c index 2e5b8a2..5a09b3a 100644 --- a/bin/ps/lomac.c +++ b/bin/ps/lomac.c @@ -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> diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 11533e8..4f76749 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -62,12 +62,22 @@ libmilter .. machine + pc + .. .. net .. netatalk .. netatm + ipatm + .. + sigpvc + .. + spans + .. + uni + .. .. netgraph .. @@ -110,6 +120,8 @@ rpcsvc .. security + lomac + .. .. sys .. diff --git a/include/Makefile b/include/Makefile index 40bb82f..0564fa1 100644 --- a/include/Makefile +++ b/include/Makefile @@ -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..." diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4 index 9f90628..78ce852 100644 --- a/share/man/man4/joy.4 +++ b/share/man/man4/joy.4 @@ -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. |
