diff options
Diffstat (limited to 'sys')
28 files changed, 100 insertions, 69 deletions
diff --git a/sys/Makefile b/sys/Makefile index 075d6d79040..3da9f4e82e5 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,18 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2000/04/28 23:17:04 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2000/05/25 21:54:37 deraadt Exp $ # $NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $ -.if make(obj) -SUBDIR= arch/alpha arch/amiga arch/arc arch/hp300 arch/i386 \ - arch/m68k arch/mac68k arch/mvme68k arch/pmax arch/powerpc \ - arch/sparc arch/wgrisc arch/vax -.else -SUBDIR+= arch/${MACHINE} - -# For manpages -.if ${MACHINE} != "amiga" -SUBDIR+= arch/amiga -.endif - -.endif +# arch/arc arch/wgrisc +SUBDIR= arch/alpha arch/amiga arch/hp300 arch/i386 \ + arch/mac68k arch/mvme68k arch/pmax arch/powerpc \ + arch/sparc arch/vax .include <bsd.subdir.mk> diff --git a/sys/arch/alpha/stand/Makefile b/sys/arch/alpha/stand/Makefile index f31fa16c8ae..4abf0902d32 100644 --- a/sys/arch/alpha/stand/Makefile +++ b/sys/arch/alpha/stand/Makefile @@ -1,6 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 1997/06/30 21:00:30 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2000/05/25 21:54:39 deraadt Exp $ # $NetBSD: Makefile,v 1.7 1997/04/10 23:03:38 cgd Exp $ -SUBDIR= boot bootxx installboot netboot setnetbootinfo libkern libsa libz +.if ${MACHINE} == "alpha" +SUBDIR= boot bootxx netboot libkern libsa libz +.endif + +SUBDIR= setnetbootinfo installboot .include <bsd.subdir.mk> diff --git a/sys/arch/alpha/stand/installboot/Makefile b/sys/arch/alpha/stand/installboot/Makefile index ab876f2740d..fc9271de5bf 100644 --- a/sys/arch/alpha/stand/installboot/Makefile +++ b/sys/arch/alpha/stand/installboot/Makefile @@ -1,15 +1,18 @@ -# $OpenBSD: Makefile,v 1.5 1997/05/05 06:01:54 millert Exp $ +# $OpenBSD: Makefile,v 1.6 2000/05/25 21:54:40 deraadt Exp $ # $NetBSD: Makefile,v 1.2 1996/11/06 23:09:13 cgd Exp $ .PATH: ${.CURDIR}/.. -PROG= installboot -BINDIR= /usr/mdec - MAN= installboot.8 MANSUBDIR=/alpha +.if ${MACHINE} == "alpha" +PROG= installboot +BINDIR= /usr/mdec DPADD+= ${LIBUTIL} LDADD+= -lutil +.else +NOPROG= +.endif .include <bsd.prog.mk> diff --git a/sys/arch/alpha/stand/setnetbootinfo/Makefile b/sys/arch/alpha/stand/setnetbootinfo/Makefile index 293399e1da8..ff30d7a5de6 100644 --- a/sys/arch/alpha/stand/setnetbootinfo/Makefile +++ b/sys/arch/alpha/stand/setnetbootinfo/Makefile @@ -1,15 +1,19 @@ -# $OpenBSD: Makefile,v 1.1 1997/05/05 06:02:02 millert Exp $ +# $OpenBSD: Makefile,v 1.2 2000/05/25 21:54:40 deraadt Exp $ # $NetBSD: Makefile,v 1.4 1997/04/06 08:41:36 cgd Exp $ .PATH: ${.CURDIR}/.. -PROG= setnetbootinfo -BINDIR= /usr/mdec - MAN= setnetbootinfo.8 MANSUBDIR=/alpha +.if ${MACHINE} == "alpha" +PROG= setnetbootinfo +BINDIR= /usr/mdec + CFLAGS+= -I${.CURDIR}/.. LDSTATIC=-static +.else +NOPROG= +.endif .include <bsd.prog.mk> diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile index 45d5dd07384..5fb8612fa55 100644 --- a/sys/arch/hp300/stand/Makefile +++ b/sys/arch/hp300/stand/Makefile @@ -1,6 +1,8 @@ -# $OpenBSD: Makefile,v 1.16 1999/08/16 09:48:16 downsj Exp $ +# $OpenBSD: Makefile,v 1.17 2000/05/25 21:54:43 deraadt Exp $ # $NetBSD: Makefile,v 1.23 1997/02/04 03:51:37 thorpej Exp $ +.if ${MACHINE} == "hp300" SUBDIR= libsa libsaz libkern libz common mkboot uboot cdboot installboot +.endif .include <bsd.subdir.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile index 65bb445d895..26170427613 100644 --- a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/05/19 14:49:43 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:54:45 deraadt Exp $ .if ${MACHINE} == "i386" PROG= cursor @@ -7,6 +7,6 @@ NOPROG=yes .endif MAN=cursor.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/fed/Makefile b/sys/arch/i386/isa/pcvt/Util/fed/Makefile index 26679140c4a..29956f77a95 100644 --- a/sys/arch/i386/isa/pcvt/Util/fed/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/fed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/05/19 14:49:43 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2000/05/25 21:54:45 deraadt Exp $ .if ${MACHINE} == "i386" PROG= fed @@ -8,6 +8,6 @@ LDADD= -lcurses NOPROG= yes .endif MAN= fed.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile index 48a1a8aa5a4..ffdb7873475 100644 --- a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2000/05/19 14:49:44 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/05/25 21:54:46 deraadt Exp $ .if ${MACHINE} == "i386" PROG= fontedit @@ -7,6 +7,6 @@ CLEANFILES+= core.fontedit fontedit.core NOPROG= yes .endif MAN= fontedit.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile index 98d1055f0b7..763545324b8 100644 --- a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/05/19 14:49:44 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2000/05/25 21:54:47 deraadt Exp $ .if ${MACHINE} == "i386" PROG= ispcvt @@ -7,6 +7,6 @@ NOPROG=yes .endif MAN8= ispcvt.${MAN8EXT} -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile index 22363dccb50..b30319d55bb 100644 --- a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2000/05/19 14:49:44 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/05/25 21:54:50 deraadt Exp $ .if ${MACHINE} == "i386" PROG= kcon @@ -14,6 +14,6 @@ NOPROG=yes .endif MAN= kcon.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile index 1ee86ad1492..01f148e3eda 100644 --- a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2000/05/25 19:08:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2000/05/25 21:54:50 deraadt Exp $ LIB = keycap CAPDIR = /usr/share/misc @@ -6,10 +6,11 @@ CAPPATH = $(CAPDIR)/keycap.pcvt KEYCAPSRC= keycap.src CFLAGS += -DKEYCAP_PATH=\"$(CAPPATH)\" SRCS = keycap.c -MAN = keycap.3 keycap.5 +MAN3 = keycap.3 +MAN5 = keycap.5 MLINKS = keycap.3 kgetent.3 keycap.3 kgetnum.3 keycap.3 kgetflag.3 \ keycap.3 kgetstr.3 -MANSUBDIR=i386 +MANSUBDIR=/i386 beforeinstall: -@if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ diff --git a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile index 9dea9d6f470..060c1bf92da 100644 --- a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/05/19 14:49:44 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:54:51 deraadt Exp $ .if ${MACHINE} == "i386" PROG= loadfont @@ -6,6 +6,6 @@ PROG= loadfont NOPROG= yes .endif MAN= loadfont.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/pcvtdoc/Makefile b/sys/arch/i386/isa/pcvt/Util/pcvtdoc/Makefile index 1aab6bf57d3..7ddfbe9f2fc 100644 --- a/sys/arch/i386/isa/pcvt/Util/pcvtdoc/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/pcvtdoc/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2000/05/19 14:49:44 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/05/25 21:54:52 deraadt Exp $ MAN4= pcvt.${MAN4EXT} -MANSUBDIR= i386 +MANSUBDIR= /i386 MLINKS= pcvt.${MAN4EXT} vt.${MAN4EXT} .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/scon/Makefile b/sys/arch/i386/isa/pcvt/Util/scon/Makefile index 055eccec516..8360db2dbff 100644 --- a/sys/arch/i386/isa/pcvt/Util/scon/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/scon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/05/19 14:49:45 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:54:52 deraadt Exp $ .if ${MACHINE} == "i386" PROG= scon @@ -7,6 +7,6 @@ NOPROG=yes .endif MAN=scon.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile index d4e94e7c180..8117e1c6ff9 100644 --- a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/05/19 14:49:45 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:54:53 deraadt Exp $ .if ${MACHINE} == "i386" PROG= vt220keys @@ -7,6 +7,6 @@ NOPROG=yes .endif MAN=vt220keys.1 -MANSUBDIR=i386 +MANSUBDIR=/i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile index 1e69ce934b0..3597ea06158 100644 --- a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/05/19 14:49:45 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:54:56 deraadt Exp $ .if ${MACHINE} == "i386" PROG= vttest @@ -9,6 +9,6 @@ NOPROG=yes .endif MAN= vttest.1 -MANSUBDIR= i386 +MANSUBDIR= /i386 .include <bsd.prog.mk> diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index b218dadbd7d..54c718eea09 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2000/05/25 20:32:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.26 2000/05/25 21:54:59 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -18,7 +18,7 @@ SRCS= srt0.S SRCS+= boot.c cmd.c vars.c bootarg.c conf.c MAN= boot.8 -MANSUBDIR=i386 +MANSUBDIR=/i386 MLINKS= boot.8 boot.conf.8 S =${.CURDIR}/../../../.. SADIR= ${.CURDIR}/.. diff --git a/sys/arch/i386/stand/installboot/Makefile b/sys/arch/i386/stand/installboot/Makefile index e52323c5e06..5a00aa2a871 100644 --- a/sys/arch/i386/stand/installboot/Makefile +++ b/sys/arch/i386/stand/installboot/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2000/05/25 20:32:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2000/05/25 21:55:01 deraadt Exp $ PROG= installboot MAN= installboot.8 -MANSUBDIR=i386 +MANSUBDIR=/i386 LDADD= -lutil DPADD= ${LIBUTIL} diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile index a5a9fc7680b..5fbde2c84ae 100644 --- a/sys/arch/i386/stand/mbr/Makefile +++ b/sys/arch/i386/stand/mbr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2000/05/25 20:32:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2000/05/25 21:55:01 deraadt Exp $ # PROG= mbr @@ -9,7 +9,7 @@ LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic NOMAN= #MAN+= mbr.8 -#MANSUBDIR=i386 +#MANSUBDIR=/i386 INSTALL_STRIP= SADIR=${.CURDIR}/.. diff --git a/sys/arch/m68k/Makefile b/sys/arch/m68k/Makefile index a603a0f63e7..26c618370da 100644 --- a/sys/arch/m68k/Makefile +++ b/sys/arch/m68k/Makefile @@ -1,5 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 1997/01/13 11:51:02 niklas Exp $ +# $OpenBSD: Makefile,v 1.7 2000/05/25 21:55:02 deraadt Exp $ +.if ${MACHINE_ARCH} == "m68k" SUBDIR+= 060sp fpsp +.endif .include <bsd.subdir.mk> diff --git a/sys/arch/mvme68k/stand/Makefile b/sys/arch/mvme68k/stand/Makefile index a3872b95ee0..d27eb82fd6b 100644 --- a/sys/arch/mvme68k/stand/Makefile +++ b/sys/arch/mvme68k/stand/Makefile @@ -1,6 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2000/03/03 00:54:52 todd Exp $ +# $OpenBSD: Makefile,v 1.6 2000/05/25 21:55:03 deraadt Exp $ +.if ${MACHINE} == "mvme68k" SUBDIR= bugcrt libbug libsa libz sboot netboot bootxx bootsd bootst \ - installboot prtvid wrtvid + prtvid wrtvid +.endif + +SUBDIR+=installboot .include <bsd.subdir.mk> diff --git a/sys/arch/mvme68k/stand/installboot/Makefile b/sys/arch/mvme68k/stand/installboot/Makefile index c6d8145831e..3f969dabdc6 100644 --- a/sys/arch/mvme68k/stand/installboot/Makefile +++ b/sys/arch/mvme68k/stand/installboot/Makefile @@ -1,15 +1,16 @@ -# $OpenBSD: Makefile,v 1.3 1999/09/26 18:05:32 smurph Exp $ +# $OpenBSD: Makefile,v 1.4 2000/05/25 21:55:03 deraadt Exp $ -PROG= installboot MAN= installboot.8 MANSUBDIR=/mvme68k +.if ${MACHINE} == "mvme68k" +PROG= installboot BINDIR=/usr/mdec DPADD=${LIBUTIL} LDADD=-lutil - -# Need this to work in the miniroot - LDSTATIC=-static +.else +NOPROG= +.endif .include <bsd.prog.mk> diff --git a/sys/arch/pmax/Makefile b/sys/arch/pmax/Makefile index 4fb8b447a3f..e95ac390f98 100644 --- a/sys/arch/pmax/Makefile +++ b/sys/arch/pmax/Makefile @@ -6,7 +6,9 @@ NOPROG= noprog NOMAN= noman +.if ${MACHINE} == "pmax" SUBDIR= boot +.endif TPMAX= ../pmax/tags SPMAX= ../pmax/pmax/*.[ch] ../pmax/include/*.h \ diff --git a/sys/arch/powerpc/Makefile b/sys/arch/powerpc/Makefile index ae12d0073cb..507c5e2238a 100644 --- a/sys/arch/powerpc/Makefile +++ b/sys/arch/powerpc/Makefile @@ -1,7 +1,9 @@ NOPROG= noprog NOMAN= noman +.if ${MACHINE} == "powerpc" SUBDIR= stand +.endif obj: _SUBDIRUSE diff --git a/sys/arch/sparc/stand/Makefile b/sys/arch/sparc/stand/Makefile index 92f5336714b..b43dcbf7f8e 100644 --- a/sys/arch/sparc/stand/Makefile +++ b/sys/arch/sparc/stand/Makefile @@ -1,6 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 1997/09/17 10:46:07 downsj Exp $ +# $OpenBSD: Makefile,v 1.7 2000/05/25 21:55:07 deraadt Exp $ # $NetBSD: Makefile,v 1.15 1997/06/01 03:39:03 mrg Exp $ -SUBDIR= libsa libkern libz boot bootxx installboot binstall +.if ${MACHINE} == "sparc" +SUBDIR= libsa libkern libz boot bootxx binstall +.endif + +SUBDIR= installboot .include <bsd.subdir.mk> diff --git a/sys/arch/sparc/stand/installboot/Makefile b/sys/arch/sparc/stand/installboot/Makefile index c79f2c623e3..98ac035b098 100644 --- a/sys/arch/sparc/stand/installboot/Makefile +++ b/sys/arch/sparc/stand/installboot/Makefile @@ -1,9 +1,14 @@ -# $OpenBSD: Makefile,v 1.4 1999/07/08 20:11:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2000/05/25 21:55:07 deraadt Exp $ -BINDIR= /usr/sbin -PROG= installboot MAN= installboot.8 MANSUBDIR=/sparc +.if ${MACHINE} == "sparc" +BINDIR= /usr/sbin +PROG= installboot +.else +NOPROG= +.endif + .include <bsd.prog.mk> diff --git a/sys/arch/vax/boot/Makefile b/sys/arch/vax/boot/Makefile index 50a4c81d7c4..d3fd0817120 100644 --- a/sys/arch/vax/boot/Makefile +++ b/sys/arch/vax/boot/Makefile @@ -1,6 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2000/04/27 02:26:18 bjc Exp $ +# $OpenBSD: Makefile,v 1.12 2000/05/25 21:55:09 deraadt Exp $ # $NetBSD: Makefile,v 1.21 1999/03/06 16:36:04 ragge Exp $ # +.if ${MACHINE} == "vax" SUBDIR= boot xxboot +.endif + .include <bsd.subdir.mk> diff --git a/sys/arch/vax/stand/Makefile b/sys/arch/vax/stand/Makefile index 50a4c81d7c4..d3fd0817120 100644 --- a/sys/arch/vax/stand/Makefile +++ b/sys/arch/vax/stand/Makefile @@ -1,6 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2000/04/27 02:26:18 bjc Exp $ +# $OpenBSD: Makefile,v 1.12 2000/05/25 21:55:09 deraadt Exp $ # $NetBSD: Makefile,v 1.21 1999/03/06 16:36:04 ragge Exp $ # +.if ${MACHINE} == "vax" SUBDIR= boot xxboot +.endif + .include <bsd.subdir.mk> |