Date: Tue, 3 Oct 2000 12:57:19 -0700 From: "David O'Brien" <obrien@freebsd.org> To: arch@freebsd.org Subject: Re: moving manpages out of /sys/modules Message-ID: <20001003125719.A3635@dragon.nuxi.com> In-Reply-To: <20001003105319.B64436@dragon.nuxi.com>; from obrien@freebsd.org on Tue, Oct 03, 2000 at 10:53:19AM -0700 References: <20001003105319.B64436@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 03, 2000 at 10:53:19AM -0700, David O'Brien wrote:
> The problem is that one cannot build a kernel and install it in
> isolation:
Which of these two patches is most stomachable?
Index: ibcs2/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ibcs2/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ibcs2/Makefile 2000/05/27 01:13:48 1.28
+++ ibcs2/Makefile 2000/10/03 19:49:29
@@ -8,13 +8,17 @@
ibcs2_isc.c ibcs2_isc_sysent.c \
ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
vnode_if.h opt_spx_hack.h
+.if !defined(MODONLY)
MAN8= ibcs2.8
+.endif
CFLAGS+= -DCOMPAT_IBCS2
EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
+.if !defined(MODONLY)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/ibcs2.sh ${DESTDIR}/usr/sbin/ibcs2
+.endif
.include <bsd.kmod.mk>
Index: joy/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/joy/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- joy/Makefile 2000/05/27 01:13:51 1.17
+++ joy/Makefile 2000/10/03 19:47:12
@@ -3,10 +3,14 @@
.PATH: ${.CURDIR}/../../isa
KMOD = joy
SRCS = bus_if.h device_if.h isa_if.h joy.c
+.if !defined(MODONLY)
MAN8 = joy.8
+.endif
+.if !defined(MODONLY)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/joy.sh ${DESTDIR}/usr/bin/joy
+.endif
.include <bsd.kmod.mk>
Index: linux/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/linux/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- linux/Makefile 2000/09/06 20:21:55 1.40
+++ linux/Makefile 2000/10/03 19:49:50
@@ -10,7 +10,9 @@
linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h
OBJS= linux_locore.o
+.if !defined(MODONLY)
MAN8= linux.8
+.endif
.if ${MACHINE_ARCH} != "alpha"
SRCS+= imgact_linux.c linux_ipc.c
@@ -35,8 +37,10 @@
opt_compat.h:
echo "#define COMPAT_43 1" > opt_compat.h
+.if !defined(MODONLY)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/linux.sh ${DESTDIR}/usr/sbin/linux
+.endif
.include <bsd.kmod.mk>
Index: svr4/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/svr4/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- svr4/Makefile 2000/08/31 22:54:01 1.18
+++ svr4/Makefile 2000/10/03 19:50:38
@@ -12,7 +12,9 @@
svr4_stream.c svr4_socket.c svr4_sockio.c svr4_machdep.c \
svr4_resource.c svr4_ipc.c
OBJS= svr4_locore.o
+.if !defined(MODONLY)
MAN8= svr4.8
+.endif
EXPORT_SYMS=_svr4_mod
CLEANFILES= svr4_assym.h svr4_genassym.o
@@ -39,8 +41,10 @@
echo "#define DEBUG_SVR4 1" >> opt_svr4.h
.endif
+.if !defined(MODONLY)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/svr4.sh ${DESTDIR}/usr/sbin/svr4
+.endif
.include <bsd.kmod.mk>
===[ OR ]===================
Index: ibcs2/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ibcs2/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ibcs2/Makefile 2000/05/27 01:13:48 1.28
+++ ibcs2/Makefile 2000/10/03 19:55:25
@@ -8,13 +8,17 @@
ibcs2_isc.c ibcs2_isc_sysent.c \
ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
vnode_if.h opt_spx_hack.h
+.if exists(${DESTDIR}/usr/share/man/man8)
MAN8= ibcs2.8
+.endif
CFLAGS+= -DCOMPAT_IBCS2
EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
+.if exists(${DESTDIR}/usr/bin)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/ibcs2.sh ${DESTDIR}/usr/sbin/ibcs2
+.endif
.include <bsd.kmod.mk>
Index: joy/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/joy/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- joy/Makefile 2000/05/27 01:13:51 1.17
+++ joy/Makefile 2000/10/03 19:55:15
@@ -3,10 +3,14 @@
.PATH: ${.CURDIR}/../../isa
KMOD = joy
SRCS = bus_if.h device_if.h isa_if.h joy.c
+.if exists(${DESTDIR}/usr/share/man/man8)
MAN8 = joy.8
+.endif
+.if exists(${DESTDIR}/usr/bin)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/joy.sh ${DESTDIR}/usr/bin/joy
+.endif
.include <bsd.kmod.mk>
Index: linux/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/linux/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- linux/Makefile 2000/09/06 20:21:55 1.40
+++ linux/Makefile 2000/10/03 19:55:21
@@ -10,7 +10,9 @@
linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h
OBJS= linux_locore.o
+.if exists(${DESTDIR}/usr/share/man/man8)
MAN8= linux.8
+.endif
.if ${MACHINE_ARCH} != "alpha"
SRCS+= imgact_linux.c linux_ipc.c
@@ -35,8 +37,10 @@
opt_compat.h:
echo "#define COMPAT_43 1" > opt_compat.h
+.if exists(${DESTDIR}/usr/bin)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/linux.sh ${DESTDIR}/usr/sbin/linux
+.endif
.include <bsd.kmod.mk>
Index: svr4/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/svr4/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- svr4/Makefile 2000/08/31 22:54:01 1.18
+++ svr4/Makefile 2000/10/03 19:55:31
@@ -12,7 +12,9 @@
svr4_stream.c svr4_socket.c svr4_sockio.c svr4_machdep.c \
svr4_resource.c svr4_ipc.c
OBJS= svr4_locore.o
+.if exists(${DESTDIR}/usr/share/man/man8)
MAN8= svr4.8
+.endif
EXPORT_SYMS=_svr4_mod
CLEANFILES= svr4_assym.h svr4_genassym.o
@@ -39,8 +41,10 @@
echo "#define DEBUG_SVR4 1" >> opt_svr4.h
.endif
+.if exists(${DESTDIR}/usr/bin)
afterinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/svr4.sh ${DESTDIR}/usr/sbin/svr4
+.endif
.include <bsd.kmod.mk>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001003125719.A3635>