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

Makefile changes to reflect moving sys/isofs/cd9660 to sys/fs/cd9660.

Browse Source 
Continue to install userland include files in /usr/include/isofs/cd9660
so as not to break userland applications such as libstand.
This commit is contained in:
rodrigc 2007-02-11 14:01:32 +00:00
parent b236d22de9
commit c9202d5e49
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Makefile
View File

@ -47,7 +47,6 @@ LSUBDIRS= cam/scsi \
fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm netgraph/netflow \
security/audit \
@ -163,6 +162,9 @@ copies:
cd ${.CURDIR}/../sys/contrib/altq/altq; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/altq
cd ${.CURDIR}/../sys/fs/cd9660/; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660
.if ${MK_IPFILTER} != "no"
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
@ -287,3 +289,8 @@ symlinks:
done
.endif
.endif
cd ${.CURDIR}/../sys/fs/cd9660; \
for h in *.h; do \
ln -fs ../../../../sys/fs/cd9660/$$h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \
done

16
sys/conf/files
View File

@ -1305,14 +1305,14 @@ isa/isahint.c optional isa
isa/orm.c optional isa
isa/pnp.c optional isa isapnp
isa/pnpparse.c optional isa isapnp
isofs/cd9660/cd9660_bmap.c optional cd9660
isofs/cd9660/cd9660_lookup.c optional cd9660
isofs/cd9660/cd9660_node.c optional cd9660
isofs/cd9660/cd9660_rrip.c optional cd9660
isofs/cd9660/cd9660_util.c optional cd9660
isofs/cd9660/cd9660_vfsops.c optional cd9660
isofs/cd9660/cd9660_vnops.c optional cd9660
isofs/cd9660/cd9660_iconv.c optional cd9660_iconv
fs/cd9660/cd9660_bmap.c optional cd9660
fs/cd9660/cd9660_lookup.c optional cd9660
fs/cd9660/cd9660_node.c optional cd9660
fs/cd9660/cd9660_rrip.c optional cd9660
fs/cd9660/cd9660_util.c optional cd9660
fs/cd9660/cd9660_vfsops.c optional cd9660
fs/cd9660/cd9660_vnops.c optional cd9660
fs/cd9660/cd9660_iconv.c optional cd9660_iconv
kern/bus_if.m standard
kern/clock_if.m optional genclock
kern/cpufreq_if.m standard

2
sys/kern/Make.tags.inc
View File

@ -94,6 +94,6 @@ COMMDIR2= ${SYS}/dev/advansys \
${SYS}/fs/specfs \
${SYS}/fs/umapfs \
${SYS}/fs/unionfs \
${SYS}/isofs/cd9660 \
${SYS}/fs/cd9660 \
${SYS}/ufs/ffs \
${SYS}/ufs/ufs

2
sys/modules/cd9660/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../isofs/cd9660
.PATH: ${.CURDIR}/../../fs/cd9660
KMOD= cd9660
SRCS= vnode_if.h \

2
sys/modules/cd9660_iconv/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../isofs/cd9660
.PATH: ${.CURDIR}/../../fs/cd9660
KMOD= cd9660_iconv
SRCS= cd9660_iconv.c