Revert previous commit.
Requested by: bde
This commit is contained in:
parent
ae5bcbff16
commit
15f3c66cd2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=54351
@ -2,6 +2,9 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
#
|
||||||
# Doing a make install builds /usr/include
|
# Doing a make install builds /usr/include
|
||||||
|
#
|
||||||
|
# The ``rm -rf''s used below are safe because rm doesn't follow symbolic
|
||||||
|
# links.
|
||||||
|
|
||||||
CLEANFILES= osreldate.h version vers.c
|
CLEANFILES= osreldate.h version vers.c
|
||||||
SUBDIR= rpcsvc
|
SUBDIR= rpcsvc
|
||||||
@ -32,14 +35,24 @@ MFILES= float.h floatingpoint.h stdarg.h varargs.h
|
|||||||
# posix4/aio.h conflicts with dysons and isn't installed:
|
# posix4/aio.h conflicts with dysons and isn't installed:
|
||||||
PFILES= mqueue.h sched.h semaphore.h # aio.h
|
PFILES= mqueue.h sched.h semaphore.h # aio.h
|
||||||
|
|
||||||
SFILES= joystick.h soundcard.h
|
# Only for default SHARED=copies case
|
||||||
|
SFILES= soundcard.h joystick.h
|
||||||
|
|
||||||
LFILES= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \
|
LFILES= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \
|
||||||
termios.h ucontext.h
|
termios.h ucontext.h
|
||||||
|
|
||||||
LDIRS= cam cam/scsi isofs/cd9660 msdosfs net netatalk netatm netgraph \
|
LDIRS= cam msdosfs net netatalk netatm netgraph netinet netinet6 \
|
||||||
netinet netinet6 netipx netkey netncp netns nfs ntfs nwfs pccard \
|
netipx netkey netncp netns nfs ntfs nwfs pccard posix4 sys vm
|
||||||
posix4 sys ufs/ffs ufs/mfs ufs/ufs vm
|
|
||||||
|
LNOHEADERDIRS= isofs ufs
|
||||||
|
LSUBDIRS= isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs cam/scsi
|
||||||
|
|
||||||
|
# Define SHARED to indicate whether you want symbolic links to the system
|
||||||
|
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
|
||||||
|
# probably only useful for developers and should be avoided if you do not
|
||||||
|
# wish to tie your /usr/include and /usr/src together.
|
||||||
|
#SHARED= symlinks
|
||||||
|
SHARED?= copies
|
||||||
|
|
||||||
all: osreldate.h
|
all: osreldate.h
|
||||||
|
|
||||||
@ -52,31 +65,23 @@ osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \
|
|||||||
echo \#'undef __FreeBSD_version' >> osreldate.h; \
|
echo \#'undef __FreeBSD_version' >> osreldate.h; \
|
||||||
echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h
|
echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h
|
||||||
|
|
||||||
beforeinstall:
|
beforeinstall: ${SHARED}
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.OBJDIR}/osreldate.h \
|
@rm -f ${DESTDIR}/usr/include/timepps.h
|
||||||
${DESTDIR}/usr/include
|
|
||||||
cd ${.CURDIR}; \
|
cd ${.CURDIR}; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${DESTDIR}/usr/include
|
${FILES} ${DESTDIR}/usr/include
|
||||||
cd ${.CURDIR}/arpa; \
|
cd ${.CURDIR}/arpa; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${ARPAFILES} \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${DESTDIR}/usr/include/arpa
|
${ARPAFILES} ${DESTDIR}/usr/include/arpa
|
||||||
cd ${.CURDIR}/protocols; \
|
cd ${.CURDIR}/protocols; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${PROTOFILES} \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${DESTDIR}/usr/include/protocols
|
${PROTOFILES} ${DESTDIR}/usr/include/protocols
|
||||||
cd ${.CURDIR}/rpc; \
|
cd ${.CURDIR}/rpc; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${RPCFILES} \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
${DESTDIR}/usr/include/rpc
|
${RPCFILES} ${DESTDIR}/usr/include/rpc
|
||||||
.for i in ${LDIRS}
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
cd ${.CURDIR}/../sys; \
|
${.OBJDIR}/osreldate.h \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
${DESTDIR}/usr/include
|
||||||
${DESTDIR}/usr/include/$i
|
|
||||||
.endfor
|
|
||||||
.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
|
|
||||||
.endif
|
|
||||||
.for i in ${LFILES}
|
.for i in ${LFILES}
|
||||||
ln -sf sys/$i ${DESTDIR}/usr/include/$i
|
ln -sf sys/$i ${DESTDIR}/usr/include/$i
|
||||||
.endfor
|
.endfor
|
||||||
@ -86,8 +91,36 @@ beforeinstall:
|
|||||||
.for i in ${PFILES}
|
.for i in ${PFILES}
|
||||||
ln -sf posix4/$i ${DESTDIR}/usr/include/$i
|
ln -sf posix4/$i ${DESTDIR}/usr/include/$i
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
copies:
|
||||||
|
.for i in ${LDIRS} ${LNOHEADERDIRS} machine
|
||||||
|
if [ -h ${DESTDIR}/usr/include/$i ]; then \
|
||||||
|
rm -f ${DESTDIR}/usr/include/$i; \
|
||||||
|
fi
|
||||||
|
.endfor
|
||||||
|
mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
|
||||||
|
-p ${DESTDIR}/usr/include
|
||||||
|
.for i in ${LDIRS} ${LSUBDIRS}
|
||||||
|
cd ${.CURDIR}/../sys; \
|
||||||
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||||
|
${DESTDIR}/usr/include/$i
|
||||||
|
.endfor
|
||||||
|
.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
|
||||||
|
.endif
|
||||||
.for i in ${SFILES}
|
.for i in ${SFILES}
|
||||||
ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
|
ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
symlinks:
|
||||||
|
@${ECHO} "Setting up symlinks to kernel source tree..."
|
||||||
|
.for i in ${LDIRS} ${LNOHEADERDIRS}
|
||||||
|
rm -rf ${DESTDIR}/usr/include/$i
|
||||||
|
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
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -8,10 +8,14 @@ DDIR= ${DESTDIR}/usr/share/examples
|
|||||||
|
|
||||||
NOOBJ= noobj
|
NOOBJ= noobj
|
||||||
|
|
||||||
|
# Define SHARED to indicate whether you want symbolic links to the system
|
||||||
|
# source (``symlinks''), or a separate copy (``copies''); (latter useful
|
||||||
|
# in environments where it's not possible to keep /sys publicly readable)
|
||||||
|
SHARED?= copies
|
||||||
|
|
||||||
all clean cleandir depend lint tags:
|
all clean cleandir depend lint tags:
|
||||||
|
|
||||||
beforeinstall: copies
|
beforeinstall: etc-examples ${SHARED}
|
||||||
(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
|
|
||||||
|
|
||||||
.for dir in ${DIRS}
|
.for dir in ${DIRS}
|
||||||
FILES!= find -L ${dir} \( -name CVS -prune \) -o -type f -print
|
FILES!= find -L ${dir} \( -name CVS -prune \) -o -type f -print
|
||||||
@ -21,4 +25,14 @@ copies::
|
|||||||
.endfor
|
.endfor
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
.for dir in ${DIRS}
|
||||||
|
symlinks::
|
||||||
|
rm -rf ${DDIR}/${dir}; ln -s ${.CURDIR}/${dir} ${DDIR}
|
||||||
|
.endfor
|
||||||
|
|
||||||
|
etc-examples:
|
||||||
|
.if ${SHARED} != "symlinks"
|
||||||
|
(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
|
||||||
|
.endif
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user