Rename mkfiles from minix.*.mk to bsd.*.mk

Makes things easier for pkgsrc

diff --git a/boot/Makefile b/boot/Makefile
index 98258045b47aad682b2d73efb2b492ebdc7e4b7d..b2b9292edb79b5aea910b97b88b736a2d72e5980 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -94,4 +94,4 @@ STRIPFLAG=    -s
 
 CLEANFILES+=   rawfs86.c edparams.c cdbootblock.s dosboot.c
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/DESCRIBE/Makefile b/commands/DESCRIBE/Makefile
index 5a94fc6b1bc571340e04a4d0d17435f7f2939e7a..ad35f8bf0c4b8d4c95c307e0854a3889db146c7f 100644 (file)
--- a/commands/DESCRIBE/Makefile
+++ b/commands/DESCRIBE/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= DESCRIBE.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/M/Makefile b/commands/M/Makefile
index 43ea0d6ac36b35721bf64f4915e13fb0eed5e71a..e8659d7f8331ce8ac75bf0f4ccff5ef9298935e5 100644 (file)
--- a/commands/M/Makefile
+++ b/commands/M/Makefile
@@ -4,4 +4,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/M ${BINDIR}/U
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/MAKEDEV/Makefile b/commands/MAKEDEV/Makefile
index fa8241785a387cc0e565582c0eda42db282f9ac2..93040ea76963334616ea903ce400cf0e8c5f6579 100644 (file)
--- a/commands/MAKEDEV/Makefile
+++ b/commands/MAKEDEV/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= MAKEDEV.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/Makefile b/commands/Makefile
index 2eeae97b375fc967877f46d46cd5074bc606dad7..eb906f6b352236228b1654a25ace718ed43fc5da 100644 (file)
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -1,6 +1,6 @@
 # Makefile for commands.
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR=        aal add_route adduser advent arp ash at autil awk \
        backup badblocks banner basename bigmake binpackage \
@@ -41,4 +41,4 @@ SUBDIR+=      atnormalize dosread fdisk loadfont \
 SUBDIR+=       acd asmconv gas2ack
 .endif
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/commands/aal/Makefile b/commands/aal/Makefile
index 957ce59ec37db297fc5e347f15a65d71b39b8c37..81ada2bf533ddaabf1e8217f0bfc566f2e480126 100644 (file)
--- a/commands/aal/Makefile
+++ b/commands/aal/Makefile
@@ -9,4 +9,4 @@ CPPFLAGS+= -I${.CURDIR} -DAAL -DSTB -DNDEBUG -DDISTRIBUTION
 LINKS+=        ${BINDIR}/aal ${BINDIR}/ar
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/acd/Makefile b/commands/acd/Makefile
index 91ff910554ad9dc23663add49f9d3ba3ff922908..ee0ddf68190c6ac0c70ae55742c4245f3a99759f 100644 (file)
--- a/commands/acd/Makefile
+++ b/commands/acd/Makefile
@@ -1,6 +1,6 @@
 # Makefile for acd
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  acd
 CPPFLAGS+= -DARCH=\"`arch`\" -DDESCR=\"/usr/lib/descr\"
@@ -10,4 +10,4 @@ FILES=                acd.descr
 FILESNAME=     descr
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/add_route/Makefile b/commands/add_route/Makefile
index 79aa4e85b6d590626e999407bd3281579639547e..350296a3b36e7fce153b168de0ca075ff7d2d9bb 100644 (file)
--- a/commands/add_route/Makefile
+++ b/commands/add_route/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/add_route ${BINDIR}/del_route
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/adduser/Makefile b/commands/adduser/Makefile
index ea1214a0ea630d8878ae194a322f8495643a6d66..a922aa548bc112a6677f98ddffd84873a99abf60 100644 (file)
--- a/commands/adduser/Makefile
+++ b/commands/adduser/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= adduser.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/advent/Makefile b/commands/advent/Makefile
index 84cf2b622a59138a92aca696b6b770978ee4c6a4..ef38c5d2d4a10ea788721b3def3253b6d5fff583 100644 (file)
--- a/commands/advent/Makefile
+++ b/commands/advent/Makefile
@@ -25,4 +25,4 @@ CPPFLAGS.advent.c= -DTEXTDIR='"${TEXTDIR}"'
 
 CLEANFILES+=   ${DATFILES} advtext.h setup
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/arp/Makefile b/commands/arp/Makefile
index 48165be3d496c56e27f6f3d0f681e07923dd4b18..2640096066f672ac89cd3dac41c2b3c4b933a24f 100644 (file)
--- a/commands/arp/Makefile
+++ b/commands/arp/Makefile
@@ -2,4 +2,4 @@ PROG=   arp
 BINMODE= 4755 
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ash/Makefile b/commands/ash/Makefile
index f9e05c17eb94968ea836a538f2f7713ae63da443..9eae2c35a7868e84cfbb58041a90eaae40336db2 100644 (file)
--- a/commands/ash/Makefile
+++ b/commands/ash/Makefile
@@ -1,6 +1,6 @@
 # Makefile for ash.
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 YHEADER=1
 PROG=  sh
@@ -83,4 +83,4 @@ operators.c operators.h: mkexpr unary_op binary_op
 arith.h: arith.c
 arith.c: arith.y
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/asmconv/Makefile b/commands/asmconv/Makefile
index 01dd6bc3d04960ffe1a497b9879dbcefb5bd4881..a53897d7d356f38532ff85e64a7b9142b22a3ac3 100644 (file)
--- a/commands/asmconv/Makefile
+++ b/commands/asmconv/Makefile
@@ -5,4 +5,4 @@ SRCS=   asm86.c asmconv.c parse_ack.c parse_gnu.c parse_bas.c \
        tokenize.c emit_ack.c emit_gnu.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/at/Makefile b/commands/at/Makefile
index a85b9a04aaa406aa81689b39d5b73f58bc7b3747..65e8e3b86b8046569b5dd6db0ce0d1ae5cd23312 100644 (file)
--- a/commands/at/Makefile
+++ b/commands/at/Makefile
@@ -2,4 +2,4 @@ PROG=   at
 BINMODE= 4755 
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/atnormalize/Makefile b/commands/atnormalize/Makefile
index a3063b80203bc25bd9e00c8308cf0a0894058e25..4b4b9bba444a81be5ba971205d0cac35a9158a93 100644 (file)
--- a/commands/atnormalize/Makefile
+++ b/commands/atnormalize/Makefile
@@ -1,4 +1,4 @@
 PROG=  atnormalize
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/autil/Makefile b/commands/autil/Makefile
index 241d7de25074f023377d0ddd3d7b817af35089fd..b23f5a372544cb0871b1531fdcf982fe1c689c92 100644 (file)
--- a/commands/autil/Makefile
+++ b/commands/autil/Makefile
@@ -7,4 +7,4 @@ CPPFLAGS+= -I${.CURDIR}
 MAN.anm=
 MAN.asize=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/autopart/Makefile b/commands/autopart/Makefile
index eb89058ebcf1b8429e9021c7574d6f4a8f04747c..37ab9a324eb98a984b13d6ae52ba08232bb1405d 100644 (file)
--- a/commands/autopart/Makefile
+++ b/commands/autopart/Makefile
@@ -1,4 +1,4 @@
 PROG=  autopart
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/awk/Makefile b/commands/awk/Makefile
index c12779db5079d8fe7adc2ad270ec705fc4fb7efe..24898ca32fb517e8e66c287505da3ec65983c34f 100644 (file)
--- a/commands/awk/Makefile
+++ b/commands/awk/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  awk
 SRCS=  awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c
@@ -14,4 +14,4 @@ maketab: awkgram.h maketab.c
 
 CLEANFILES= maketab proctab.c
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/backup/Makefile b/commands/backup/Makefile
index 753eec48643d0188f284eb44d0eef4f5cdfb95be..0d4a75d351ae680446ff3f06b999e8de70e5e472 100644 (file)
--- a/commands/backup/Makefile
+++ b/commands/backup/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/backup ${BINDIR}/restore
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/badblocks/Makefile b/commands/badblocks/Makefile
index 791fa3b4cf19808355e8ba54f407b9f8bc5feca9..40097594ccfd4bec1ce9bb90dc08274284ac8d26 100644 (file)
--- a/commands/badblocks/Makefile
+++ b/commands/badblocks/Makefile
@@ -2,4 +2,4 @@ PROG=   badblocks
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/banner/Makefile b/commands/banner/Makefile
index 87989f69cd4da18bbb1bde025a7faa51e32c6aef..64acb6e6e8b0231f8ee6d90777423bb3c5ebd6f2 100644 (file)
--- a/commands/banner/Makefile
+++ b/commands/banner/Makefile
@@ -1,4 +1,4 @@
 PROG=  banner
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/basename/Makefile b/commands/basename/Makefile
index ab966c5231a1a859d6e554fc7afa2c1ae91747da..7a5acc21da6e28a6d11a18c7fce9b9194c100c2b 100644 (file)
--- a/commands/basename/Makefile
+++ b/commands/basename/Makefile
@@ -1,4 +1,4 @@
 PROG=  basename
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/bigmake/Makefile b/commands/bigmake/Makefile
index d23d3edd2f38014121f3c4df065348c802f700ae..4833eaaed41123d7d95f4680c4edbe9bc077b8af 100644 (file)
--- a/commands/bigmake/Makefile
+++ b/commands/bigmake/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= bigmake.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/binpackage/Makefile b/commands/binpackage/Makefile
index 11197820b30010b75c7dc0de0df9c4f152ad2870..7587f2bac9da190160cc98424e995dedcb7aba29 100644 (file)
--- a/commands/binpackage/Makefile
+++ b/commands/binpackage/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= binpackage.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/binpackages/Makefile b/commands/binpackages/Makefile
index 079bce1d347a01b420f14efec2ee75079e5dc9fd..575951de4e37f848dc4e414cfa5bafade55446fb 100644 (file)
--- a/commands/binpackages/Makefile
+++ b/commands/binpackages/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= binpackages.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/binsizes/Makefile b/commands/binsizes/Makefile
index 9494194816286ee30787f071d7133f1319562d84..471f5a39d0484926326b6ad5db23cb316e333492 100644 (file)
--- a/commands/binsizes/Makefile
+++ b/commands/binsizes/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= binsizes.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/bzip2/Makefile b/commands/bzip2/Makefile
index 0768cee4c6acd06b2d897b13615bcf5bdc51237d..fcf7784745adfdb55132eeaa9a60fe287f7baa13 100644 (file)
--- a/commands/bzip2/Makefile
+++ b/commands/bzip2/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=     bzip2
 DPADD+=           ${LIBBZ2}
@@ -11,4 +11,4 @@ MLINKS+=   bzip2.1 bunzip2.1\
 LINKS+=    ${BINDIR}/bzip2 ${BINDIR}/bunzip2
 LINKS+=    ${BINDIR}/bzip2 ${BINDIR}/bzcat
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/bzip2recover/Makefile b/commands/bzip2recover/Makefile
index 00837fdd8b4e628d7d8f3dde0d3305ce12c1354c..194f63c3fc55375fe13d6a85cde43dc721f4283c 100644 (file)
--- a/commands/bzip2recover/Makefile
+++ b/commands/bzip2recover/Makefile
@@ -1,6 +1,6 @@
 NOMAN=
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=       bzip2recover
 CPPFLAGS+= -I ${BZ2DIR}
@@ -8,4 +8,4 @@ CPPFLAGS+= -I ${BZ2DIR}
 BZ2DIR=                ${MINIXSRCDIR}/commands/bzip2
 .PATH:         ${BZ2DIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cal/Makefile b/commands/cal/Makefile
index 69d99242f609c6c0643661466e2072c79f86ccff..485169960457a0196c816e6f0c4f5669536ec5fc 100644 (file)
--- a/commands/cal/Makefile
+++ b/commands/cal/Makefile
@@ -1,4 +1,4 @@
 PROG=  cal
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/calendar/Makefile b/commands/calendar/Makefile
index 0114fbc5c97f116317c05646eec19057a9c82a92..26275d475cc6e81d20a3383cbd187ee52caab38c 100644 (file)
--- a/commands/calendar/Makefile
+++ b/commands/calendar/Makefile
@@ -1,4 +1,4 @@
 PROG=  calendar
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cat/Makefile b/commands/cat/Makefile
index e0e29c860bb2cbf6f95b6601f13e1f6334107ca3..1d00fd4a3794df98edbd648b243f84609e3fedfd 100644 (file)
--- a/commands/cat/Makefile
+++ b/commands/cat/Makefile
@@ -2,4 +2,4 @@ PROG=   cat
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cawf/Makefile b/commands/cawf/Makefile
index f8388b1c9e040c8c57d32521c001dfa11e81293b..a24d73a50126f61f3a1821e3acd4e9ee1ce2c47a 100644 (file)
--- a/commands/cawf/Makefile
+++ b/commands/cawf/Makefile
@@ -49,4 +49,4 @@ MAN.bsfilt=
 FILESDIR=      /usr/lib/cawf
 FILES= common device.cf dumb.dev man.mac me.mac ms.mac mnx.mac
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cd/Makefile b/commands/cd/Makefile
index bac0f80b3ecaeff089e5d37e187e621743854930..35a04b02841bb5da526bad39e5f6df0346172e89 100644 (file)
--- a/commands/cd/Makefile
+++ b/commands/cd/Makefile
@@ -15,4 +15,4 @@ LINKS+=       ${BINDIR}/cd ${BINDIR}/umask
 LINKS+=        ${BINDIR}/cd ${BINDIR}/wait
 
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cdprobe/Makefile b/commands/cdprobe/Makefile
index 327dfe2e220a3074abeef2ef094f94fbaa00aeea..3fd7727c8b7406443cc26facd05380ef092546df 100644 (file)
--- a/commands/cdprobe/Makefile
+++ b/commands/cdprobe/Makefile
@@ -2,4 +2,4 @@ PROG=   cdprobe
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/checkhier/Makefile b/commands/checkhier/Makefile
index 6725dbb8eed31b42032a092c40f3a88b79a6f6d2..897584cb5511079cbb6d0e401658fec29b660914 100644 (file)
--- a/commands/checkhier/Makefile
+++ b/commands/checkhier/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= checkhier.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/chmem/Makefile b/commands/chmem/Makefile
index 77950025334e3f035dc63b21b89041ed2f7795a6..cb61b5a1b0fd6bb3c21c3f9a5287592c26f81653 100644 (file)
--- a/commands/chmem/Makefile
+++ b/commands/chmem/Makefile
@@ -1,4 +1,4 @@
 PROG=  chmem
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/chmod/Makefile b/commands/chmod/Makefile
index 15fccdc17079386c50f4897f327ad82c6123a99b..1c97a5be2014d3c531efd6f48b61bd7229bae953 100644 (file)
--- a/commands/chmod/Makefile
+++ b/commands/chmod/Makefile
@@ -1,4 +1,4 @@
 PROG=  chmod
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/chown/Makefile b/commands/chown/Makefile
index 807975d97d2e2249868375e5ec6dc56698ce11ee..d2fbd6890822c5736a007d1370755a7448f1c85e 100644 (file)
--- a/commands/chown/Makefile
+++ b/commands/chown/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/chown ${BINDIR}/chgrp
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/chroot/Makefile b/commands/chroot/Makefile
index eb3563642880440994f6b62da77b53961bb800a9..c1cdc56258d03bb50f40900ada06f38c073cd7e4 100644 (file)
--- a/commands/chroot/Makefile
+++ b/commands/chroot/Makefile
@@ -2,4 +2,4 @@ PROG=   chroot
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ci/Makefile b/commands/ci/Makefile
index cbef9467c939734b60efbc019d9978e3bfc88a6c..a738d3cc1ba249d6c735ba2988b972b873172ab3 100644 (file)
--- a/commands/ci/Makefile
+++ b/commands/ci/Makefile
@@ -1,4 +1,4 @@
 PROG=  ci
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cksum/Makefile b/commands/cksum/Makefile
index e22eda4fa0c65078f44bc66de62ede624121397c..136aa6ff3cb97ea3a499b9550d1c3fa334ecb028 100644 (file)
--- a/commands/cksum/Makefile
+++ b/commands/cksum/Makefile
@@ -1,4 +1,4 @@
 PROG=  cksum
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cleantmp/Makefile b/commands/cleantmp/Makefile
index 5aab7302675e31891a86f291c0cf5854a369559d..ff4c1f2851320bf5e06d13ce821c4ee1de343111 100644 (file)
--- a/commands/cleantmp/Makefile
+++ b/commands/cleantmp/Makefile
@@ -1,4 +1,4 @@
 PROG=  cleantmp
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/clear/Makefile b/commands/clear/Makefile
index 474335b2a577dfaf406faee462984e1fc4953762..ea538eda1db2e1d089ca6e9c506e77fda1dbcb9c 100644 (file)
--- a/commands/clear/Makefile
+++ b/commands/clear/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/clear ${BINDIR}/clr
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cmp/Makefile b/commands/cmp/Makefile
index 68c1a5923efe4943200177844193b5c5ae61ff22..4daa90b57acd5f5ffe5b706b16ba75425304de34 100644 (file)
--- a/commands/cmp/Makefile
+++ b/commands/cmp/Makefile
@@ -1,4 +1,4 @@
 PROG=  cmp
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/co/Makefile b/commands/co/Makefile
index f7605d7e110adbdc0c85abd24314a9cd723d228b..aa947ab4cc4baaaa563ac7485fa4b6ad52a19769 100644 (file)
--- a/commands/co/Makefile
+++ b/commands/co/Makefile
@@ -1,4 +1,4 @@
 PROG=  co
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/comm/Makefile b/commands/comm/Makefile
index 2766aad654baf6ba9dd6265865a0b3ca34cd7350..7d089949fa2ba68cdb9f042b8732647dd5e2a65d 100644 (file)
--- a/commands/comm/Makefile
+++ b/commands/comm/Makefile
@@ -1,4 +1,4 @@
 PROG=  comm
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/compress/Makefile b/commands/compress/Makefile
index 4fd1d8cb9d4e79051325b6abc80631e4263af812..5f72558bbba267973874d56fed4b0afed3e2f591 100644 (file)
--- a/commands/compress/Makefile
+++ b/commands/compress/Makefile
@@ -4,4 +4,4 @@ MAN=
 LINKS+=      ${BINDIR}/compress ${BINDIR}/uncompress
 LINKS+=      ${BINDIR}/compress ${BINDIR}/zcat
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cp/Makefile b/commands/cp/Makefile
index bd814b9b21cf565890d0adb3df31e8eed05d8112..f895a942b1e09769c5957834ad537fc0741878fd 100644 (file)
--- a/commands/cp/Makefile
+++ b/commands/cp/Makefile
@@ -8,4 +8,4 @@ LINKS+=      ${BINDIR}/cp ${BINDIR}/ln
 LINKS+=      ${BINDIR}/cp ${BINDIR}/clone
 LINKS+=      ${BINDIR}/cp ${BINDIR}/cpdir
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/crc/Makefile b/commands/crc/Makefile
index 112b107de187eede3d9eda388d7b3d1c4d83e6a7..e07f16f19b9d61d2e66827a601f27688af9896ad 100644 (file)
--- a/commands/crc/Makefile
+++ b/commands/crc/Makefile
@@ -1,4 +1,4 @@
 PROG=  crc
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cron/Makefile b/commands/cron/Makefile
index 416f1f7faba99e3b058b49a01c95ca4e7dbf0cec..20e67631a8222da1e0a6f5ad906d4d3872229e72 100644 (file)
--- a/commands/cron/Makefile
+++ b/commands/cron/Makefile
@@ -4,4 +4,4 @@ PROG=   cron
 SRCS=  cron.c tab.c misc.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/crontab/Makefile b/commands/crontab/Makefile
index 84929160bd4c96290f167d3b7effac73e62e92ee..59389749965fb1c67abdbc5108ff054c0bfd228f 100644 (file)
--- a/commands/crontab/Makefile
+++ b/commands/crontab/Makefile
@@ -1,6 +1,6 @@
 # Makefile for crontab.
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  crontab
 SRCS=  crontab.c tab.c misc.c
@@ -10,4 +10,4 @@ MAN=
 
 .PATH: ${MINIXSRCDIR}/commands/cron
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/cut/Makefile b/commands/cut/Makefile
index 3a6fb2909f2ae974ef19a92c1a6bf1ed4ef08d54..1aed929efa542f368c56e83674eeee89a45b7d38 100644 (file)
--- a/commands/cut/Makefile
+++ b/commands/cut/Makefile
@@ -6,4 +6,4 @@ PROG=   cut
 LDADD+=        -lutil
 DPADD+=        ${LIBUTIL}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/datasizes/Makefile b/commands/datasizes/Makefile
index 2aed57a6c171bef8952d67fd2911f42e78232074..95e6110cf649e9962bb44d4f60db3374d6529fa9 100644 (file)
--- a/commands/datasizes/Makefile
+++ b/commands/datasizes/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= datasizes.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/date/Makefile b/commands/date/Makefile
index 3fad6a01107d50342f68bd09dcdb40bde7ab4840..2c82a24bf7784aefcfff5462e4ebdd0721b82b54 100644 (file)
--- a/commands/date/Makefile
+++ b/commands/date/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  date
 SRCS=  date.c logwtmp.c
@@ -8,4 +8,4 @@ BINDIR= /bin
 
 .PATH: ${MINIXSRCDIR}/lib/libc/stdtime
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dd/Makefile b/commands/dd/Makefile
index 7a740bb3a87eb2783291c4ed32656cc8867912ae..491f479565748850796c1398f5aeb1cd3f83d38a 100644 (file)
--- a/commands/dd/Makefile
+++ b/commands/dd/Makefile
@@ -1,4 +1,4 @@
 PROG=  dd
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/de/Makefile b/commands/de/Makefile
index 369c5da8fbfd662d5afe4eefca6e96bfad2a57ae..a30ff550a4c7fcbadca66a14df1e7c53b0704a16 100644 (file)
--- a/commands/de/Makefile
+++ b/commands/de/Makefile
@@ -6,4 +6,4 @@ CPPFLAGS+= -I${MINIXSRCDIR}/servers
 CPPFLAGS+= -D_POSIX_1_SOURCE=2
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/decomp16/Makefile b/commands/decomp16/Makefile
index ac2fa3e48dacc2d02649e22c2042b5f065adf4bd..70f4d3cd9e967bd2c45449add691af8beb033f65 100644 (file)
--- a/commands/decomp16/Makefile
+++ b/commands/decomp16/Makefile
@@ -1,4 +1,4 @@
 PROG=  decomp16
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dev2name/Makefile b/commands/dev2name/Makefile
index 5a7a0af02310cd98fc61ad7e46d69a99548b1047..797001247c47a5adfbe46834b233b0825d0a049c 100644 (file)
--- a/commands/dev2name/Makefile
+++ b/commands/dev2name/Makefile
@@ -2,4 +2,4 @@ PROG=   dev2name
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/devsize/Makefile b/commands/devsize/Makefile
index 76348ce81df1b24fcb42b4de37cbba6b866c69f9..e7f0eeefe7553f47ff515ebdc382e217a51096af 100644 (file)
--- a/commands/devsize/Makefile
+++ b/commands/devsize/Makefile
@@ -1,4 +1,4 @@
 PROG=  devsize
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/df/Makefile b/commands/df/Makefile
index a76e1bdfeca2c8b29a20e42aa428c895b3c3d233..a5021d28c29f3cd73a95d7c2dec309b5b7bbdcd7 100644 (file)
--- a/commands/df/Makefile
+++ b/commands/df/Makefile
@@ -3,4 +3,4 @@ CPPFLAGS+= -I${MINIXSRCDIR}
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dhcpd/Makefile b/commands/dhcpd/Makefile
index b3e4689d09925329b92a89224c19ef64a9d2b3ea..140616514f4683d401190a2db319bca0683cb645 100644 (file)
--- a/commands/dhcpd/Makefile
+++ b/commands/dhcpd/Makefile
@@ -4,4 +4,4 @@ PROG=   dhcpd
 SRCS=  dhcpd.c tags.c devices.c ether.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dhrystone/Makefile b/commands/dhrystone/Makefile
index 767d3a0bdc8d4539bed4cdba61fcee072c20c53f..8f7bef3746dd07b493ac5cbe241936f60d900eed 100644 (file)
--- a/commands/dhrystone/Makefile
+++ b/commands/dhrystone/Makefile
@@ -1,4 +1,4 @@
 PROG=  dhrystone
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/diff/Makefile b/commands/diff/Makefile
index d41c09782074cf88b99cbdfbfdfd315ac4dbcb51..9fcdc24ad6f8596d0e3f5093a7062146db760095 100644 (file)
--- a/commands/diff/Makefile
+++ b/commands/diff/Makefile
@@ -3,5 +3,5 @@
 PROG=  diff
 SRCS=  diff.c diffdir.c diffreg.c xmalloc.c
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>
 

diff --git a/commands/dirname/Makefile b/commands/dirname/Makefile
index 73c59d5cfa566c0d0c51f4326a86f1723b6fe261..939bfafa47e97cf43d27efa4bb8c57e52223d53b 100644 (file)
--- a/commands/dirname/Makefile
+++ b/commands/dirname/Makefile
@@ -1,4 +1,4 @@
 PROG=  dirname
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dis88/Makefile b/commands/dis88/Makefile
index 769ced2395c80fbb6cae40e588f7fb454d8e6a11..5daec730a70f5bf64b8ee572b20e41e4a8f4fd0c 100644 (file)
--- a/commands/dis88/Makefile
+++ b/commands/dis88/Makefile
@@ -28,4 +28,4 @@ PROG= dis88
 SRCS=  disrel.c dismain.c distabs.c dishand.c disfp.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dosread/Makefile b/commands/dosread/Makefile
index 394a5df6924221809a7bba07b6caeb2cd99c05d6..5b694f9d783cde0c498d8fb111abb7c2e6934834 100644 (file)
--- a/commands/dosread/Makefile
+++ b/commands/dosread/Makefile
@@ -4,4 +4,4 @@ MAN=
 LINKS+= ${BINDIR}/dosread ${BINDIR}/doswrite
 LINKS+= ${BINDIR}/dosread ${BINDIR}/dosdir
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/du/Makefile b/commands/du/Makefile
index 4f0acfabb5c0caf8a53d63c20530690bcc4da6bc..2f509c4218a39c285b2221e94511e4f3ac24391a 100644 (file)
--- a/commands/du/Makefile
+++ b/commands/du/Makefile
@@ -2,4 +2,4 @@ PROG=   du
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/dumpcore/Makefile b/commands/dumpcore/Makefile
index de8682fc71bbf44692a922f3c9def38c843e8a84..2488ed10c0d5a9683b49f32c12eb6546cecf0782 100644 (file)
--- a/commands/dumpcore/Makefile
+++ b/commands/dumpcore/Makefile
@@ -2,4 +2,4 @@ PROG=   dumpcore
 CPPFLAGS+= -I${MINIXSRCDIR}
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/easypack/Makefile b/commands/easypack/Makefile
index 8eac3e57bce43164d55f4b5ec09e12cfa7169ff3..c49b539b1da136140a0189cf291bee6386d4481b 100644 (file)
--- a/commands/easypack/Makefile
+++ b/commands/easypack/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= easypack.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ed/Makefile b/commands/ed/Makefile
index 4a532737825b4a266bc9a7673edf9cc696180ad3..383cd12400fcfbf6f6cfc180c7b5a5d312e082a7 100644 (file)
--- a/commands/ed/Makefile
+++ b/commands/ed/Makefile
@@ -1,4 +1,4 @@
 PROG=  ed
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/eject/Makefile b/commands/eject/Makefile
index 6550a8fbc55715dea59158f7f2f95a9679d65fc5..24b9b005569a83c3df9a9310ddeb73bcc6a23133 100644 (file)
--- a/commands/eject/Makefile
+++ b/commands/eject/Makefile
@@ -1,4 +1,4 @@
 PROG=  eject
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/elle/Makefile b/commands/elle/Makefile
index ea2849aa60c8984ff0218e179d1cdd9849a7a7e7..8f26e34097456d8650639fe58473fd10e0a424ef 100644 (file)
--- a/commands/elle/Makefile
+++ b/commands/elle/Makefile
@@ -26,4 +26,4 @@ eefidx.h:     deffun.e
 # Don't flush these files if interrupted, dammit!
 .PRECIOUS: ellec deffun.e defprf.e
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/elvis/Makefile b/commands/elvis/Makefile
index cf3cd0fb53c6435a596bec7e850e2b91392176af..5f0885aadcd1a2015aa39d0679c8c55d6a5322db 100644 (file)
--- a/commands/elvis/Makefile
+++ b/commands/elvis/Makefile
@@ -36,4 +36,4 @@ MAN.elvrec=
 MAN.fmt=
 MAN.elvprsv=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/env/Makefile b/commands/env/Makefile
index 242767dad03ac86999ab038d0779ea409d55a182..9314c762a8f7004118ebb580b6f59a7f06475538 100644 (file)
--- a/commands/env/Makefile
+++ b/commands/env/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/env ${BINDIR}/printenv
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/expand/Makefile b/commands/expand/Makefile
index dead4bd66a0c22bf00338495cb6310d716a6610e..89f84541a2dbbd982a27baff4c62c942f835312a 100644 (file)
--- a/commands/expand/Makefile
+++ b/commands/expand/Makefile
@@ -1,4 +1,4 @@
 PROG=  expand
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/factor/Makefile b/commands/factor/Makefile
index e991858aa83e9b824917d5015ee18e31aca406b5..eea3708016f4519cc7ce5d309a84e36c02432838 100644 (file)
--- a/commands/factor/Makefile
+++ b/commands/factor/Makefile
@@ -1,4 +1,4 @@
 PROG=  factor
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fdisk/Makefile b/commands/fdisk/Makefile
index c2a8f42386c0c0737c0065d6dfc833903b106d7c..cbf169b0854fbe2ad0fcbb3dd01525c3c83e8ac0 100644 (file)
--- a/commands/fdisk/Makefile
+++ b/commands/fdisk/Makefile
@@ -1,4 +1,4 @@
 PROG=  fdisk
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/file/Makefile b/commands/file/Makefile
index 47011dd6b3292df365a1eec311d41b7921bf4e53..e5abca36e4ee9e96aa507de4207c5477f7e3b847 100644 (file)
--- a/commands/file/Makefile
+++ b/commands/file/Makefile
@@ -1,4 +1,4 @@
 PROG=  file
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/find/Makefile b/commands/find/Makefile
index 176500caf2df2101b697c5620968b2b85a1b4656..ec8f99c60e0080cb990924e9946340c27334abbd 100644 (file)
--- a/commands/find/Makefile
+++ b/commands/find/Makefile
@@ -1,7 +1,7 @@
 #      $NetBSD: Makefile,v 1.12 2006/12/14 20:55:56 he Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  find
 SRCS=  find.c function.c ls.c main.c misc.c operator.c option.c
@@ -11,4 +11,4 @@ CFLAGS += -Wall
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/finger/Makefile b/commands/finger/Makefile
index 7dc1a3299996b8c9d3daf029a330a795b8c90d5e..34e9f8c59b620772330239aff019f32b55f568b6 100644 (file)
--- a/commands/finger/Makefile
+++ b/commands/finger/Makefile
@@ -1,4 +1,4 @@
 PROG=  finger
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fingerd/Makefile b/commands/fingerd/Makefile
index 88574f8617aa4994486da7a4091223dea2574739..01c9369cd7fb9e05d32e7a882f9c8e6e635ae8cb 100644 (file)
--- a/commands/fingerd/Makefile
+++ b/commands/fingerd/Makefile
@@ -2,4 +2,4 @@ PROG=   in.fingerd
 SRCS=  fingerd.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fix/Makefile b/commands/fix/Makefile
index 68a20c279b4d781df3dcda865b0c66665de849a3..9caaa4219f7f0c13fc4abba5c1ac05a9fd942c4b 100644 (file)
--- a/commands/fix/Makefile
+++ b/commands/fix/Makefile
@@ -1,4 +1,4 @@
 PROG=  fix
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fold/Makefile b/commands/fold/Makefile
index 2a8cd607fe2c5d698133566449b4db6935926ddf..12a1984bcee0aa30da0f62c85caf57ac89f7aed0 100644 (file)
--- a/commands/fold/Makefile
+++ b/commands/fold/Makefile
@@ -1,4 +1,4 @@
 PROG=  fold
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/format/Makefile b/commands/format/Makefile
index 7c511487a9866bf6a9a46c4f5d6dc88fb6af06fb..ac3215f3cf5de4ab959e0802743134171bc39db1 100644 (file)
--- a/commands/format/Makefile
+++ b/commands/format/Makefile
@@ -2,4 +2,4 @@ PROG=   format
 BIMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fortune/Makefile b/commands/fortune/Makefile
index 1fcd1980fa1fc0fc960114f33673999cbebec098..7968db577d7fcd4cbe4f9ec62b0f239d266be609 100644 (file)
--- a/commands/fortune/Makefile
+++ b/commands/fortune/Makefile
@@ -3,4 +3,4 @@ MAN=
 FILESDIR=       /usr/lib
 FILES=          fortune.dat
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fsck/Makefile b/commands/fsck/Makefile
index b700f96c4aa6642edae6c1c46d269ce220a39ee2..4311013e5559d287431047dc91befda4a2ace404 100644 (file)
--- a/commands/fsck/Makefile
+++ b/commands/fsck/Makefile
@@ -3,4 +3,4 @@ CPPFLAGS+= -I${MINIXSRCDIR}/servers
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/fsck1/Makefile b/commands/fsck1/Makefile
index 503541e10293f5013630fe5900aba1847e88672c..70ad690084f177cb5b8b1a8f3a1cb4e7ce5f06a5 100644 (file)
--- a/commands/fsck1/Makefile
+++ b/commands/fsck1/Makefile
@@ -2,4 +2,4 @@ PROG=   fsck1
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ftp101/Makefile b/commands/ftp101/Makefile
index 941f4ce48889cc71236cf857c85f50bd86bb62eb..553f02a2c4eb8b6d0437f255a4379fe6e67c05b8 100644 (file)
--- a/commands/ftp101/Makefile
+++ b/commands/ftp101/Makefile
@@ -8,4 +8,4 @@ PROG=   ftp
 SRCS=  ftp.c local.c file.c xfer.c other.c net.c crc.c
 CPPFLAGS+= -DCRC_ONLY
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ftpd200/Makefile b/commands/ftpd200/Makefile
index 10ac4153bdddcb7ccb0fcd6eac040817596c65fb..fe9df7d76f0fd1b322d2e560c2f03cdab6143119 100644 (file)
--- a/commands/ftpd200/Makefile
+++ b/commands/ftpd200/Makefile
@@ -9,4 +9,4 @@ MAN=            ftpd.8
 SCRIPTS=       ftpdsh
 FILES=         setup.anonftp
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/gas2ack/Makefile b/commands/gas2ack/Makefile
index 861b1c6dbf406d1d4db8a289d6af02f42a6559e9..a56eec5cb3180d06aeec23d60dbbfffa514dddda 100644 (file)
--- a/commands/gas2ack/Makefile
+++ b/commands/gas2ack/Makefile
@@ -5,4 +5,4 @@ SRCS=   asm86.c gas2ack.c globals.c parse_gnu.c \
        tokenize.c emit_ack.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/getty/Makefile b/commands/getty/Makefile
index 9e19d85e4a931cd78c9aef42a45ce218d59ae4b7..6425275df5a254e17b17fedc4e00e141272c913b 100644 (file)
--- a/commands/getty/Makefile
+++ b/commands/getty/Makefile
@@ -2,4 +2,4 @@ PROG=   getty
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/gomoku/Makefile b/commands/gomoku/Makefile
index e978157e9bf5712f3a1950a5aebdfaaa82f041ce..71e41aafe5cc71bd2770285138895d127c3bb069 100644 (file)
--- a/commands/gomoku/Makefile
+++ b/commands/gomoku/Makefile
@@ -4,4 +4,4 @@ MAN=
 DPADD+= ${LIBCURSES}
 LDADD+= -lcurses
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/grep/Makefile b/commands/grep/Makefile
index 34c9fb4817c9e11e04b0a030b53ce844c96f89d4..cd28a33f755ebf71179e33f9bc9fbab163bd67be 100644 (file)
--- a/commands/grep/Makefile
+++ b/commands/grep/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+= -isystem ../../../include
 .endif
 
 .if ${OPSYS} == "Minix"
-.include <minix.prog.mk>
+.include <bsd.prog.mk>
 .else
 .include <bsd.prog.mk>
 .endif

diff --git a/commands/head/Makefile b/commands/head/Makefile
index f306dbc46ac1fa178c14517c3bdeb3522f69ebe1..a37d09e4f9c858df4c8a71ed56ef750b386390f7 100644 (file)
--- a/commands/head/Makefile
+++ b/commands/head/Makefile
@@ -1,4 +1,4 @@
 PROG=  head
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/host/Makefile b/commands/host/Makefile
index a9ba3c3ca741bcdf3ee423e99d46dfe5fa7f1ab3..1186419b02eb1173e8d02746c689b5a62b7bce6e 100644 (file)
--- a/commands/host/Makefile
+++ b/commands/host/Makefile
@@ -1,4 +1,4 @@
 PROG=  host
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/hostaddr/Makefile b/commands/hostaddr/Makefile
index fd2f749d9524c4436e3976d516644bf03c019063..38065619a1c5d4857784b6ee49966030c648dc27 100644 (file)
--- a/commands/hostaddr/Makefile
+++ b/commands/hostaddr/Makefile
@@ -2,4 +2,4 @@ PROG=   hostaddr
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/id/Makefile b/commands/id/Makefile
index 90ed061e19f8bf9c838bd6884c6d10cc94ad8341..4e11db3caf6d3f6f40b768cda092acf0f1d7d234 100644 (file)
--- a/commands/id/Makefile
+++ b/commands/id/Makefile
@@ -6,4 +6,4 @@ MAN=    id.1 groups.1 whoami.1
 LINKS=   ${BINDIR}/id ${BINDIR}/groups
 LINKS+=  ${BINDIR}/id ${BINDIR}/whoami
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ifconfig/Makefile b/commands/ifconfig/Makefile
index 82103769459399d88d61f4a675e71333c65f0731..bad9533fc77d0c1643f8deeaeee006168cec619a 100644 (file)
--- a/commands/ifconfig/Makefile
+++ b/commands/ifconfig/Makefile
@@ -2,4 +2,4 @@ PROG=   ifconfig
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ifdef/Makefile b/commands/ifdef/Makefile
index e7b5e3d383c0944ee19f08be691c59708097f41f..6328f196845eab2f8a34462aaaa9f17df9ac7f8e 100644 (file)
--- a/commands/ifdef/Makefile
+++ b/commands/ifdef/Makefile
@@ -1,4 +1,4 @@
 PROG=  ifdef
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/indent/Makefile b/commands/indent/Makefile
index 2f1d70b198a78a05441f07a8f04323d70e223cca..03f7e0ca69c4c751e1971784792d957bbf65d796 100644 (file)
--- a/commands/indent/Makefile
+++ b/commands/indent/Makefile
@@ -4,4 +4,4 @@ PROG=   indent
 SRCS=  args.c comment.c lexi.c indent.c parse.c io.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/install/Makefile b/commands/install/Makefile
index 80446269afc5b1717ae9d10750326cb582f10406..1c52030db2fd87f7541240932e1dd34fb649fe9d 100644 (file)
--- a/commands/install/Makefile
+++ b/commands/install/Makefile
@@ -6,4 +6,4 @@ MAN=
 
 PROGNAME=install
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/intr/Makefile b/commands/intr/Makefile
index b990facb7baed46cefcfb0462dc3cce9b8466c5a..579e447d6de7e613dbf1fad14c7c5b1627a47219 100644 (file)
--- a/commands/intr/Makefile
+++ b/commands/intr/Makefile
@@ -2,4 +2,4 @@ PROG=   intr
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ipcrm/Makefile b/commands/ipcrm/Makefile
index 8ee2ee29e0a87068ccae57c69ecaa04f2539933f..ceba4d72bf147c738a4b0290ac4b99f4463ac88e 100644 (file)
--- a/commands/ipcrm/Makefile
+++ b/commands/ipcrm/Makefile
@@ -1,4 +1,4 @@
 PROG=  ipcrm
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ipcs/Makefile b/commands/ipcs/Makefile
index 10d2772a0b70f724911f7ef430f1adcdc42be372..d521fca1500cb6b71a4f6715a81a816312bbaf09 100644 (file)
--- a/commands/ipcs/Makefile
+++ b/commands/ipcs/Makefile
@@ -1,4 +1,4 @@
 PROG=  ipcs
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/irdpd/Makefile b/commands/irdpd/Makefile
index c3719235925113d771c247b4b46b3e521a53b32b..5df971fd1d93d35cd92618497c2ff8c5f21990ef 100644 (file)
--- a/commands/irdpd/Makefile
+++ b/commands/irdpd/Makefile
@@ -1,4 +1,4 @@
 PROG=  irdpd
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/isoread/Makefile b/commands/isoread/Makefile
index d77ca8cad0feeb214d7788a7050fad4b52582f75..952acafcaab3cab82dd2c66f4b2b73d45d819527 100644 (file)
--- a/commands/isoread/Makefile
+++ b/commands/isoread/Makefile
@@ -4,4 +4,4 @@ MAN=
 LINKS+=      ${BINDIR}/isoread ${BINDIR}/isodir
 LINKS+=      ${BINDIR}/isoread ${BINDIR}/isoinfo
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/join/Makefile b/commands/join/Makefile
index b08ac31c99171c53c53c6d5ae72a15e7b53da932..c7d224c5e00475ffdf35d6a3bdf86a22fe202065 100644 (file)
--- a/commands/join/Makefile
+++ b/commands/join/Makefile
@@ -1,4 +1,4 @@
 PROG=  join
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/kill/Makefile b/commands/kill/Makefile
index 26a0c6f88c593001a32a8b108d3e93e7c5633de2..509f5ef2d8d7608233a2f0caff03388adef5e216 100644 (file)
--- a/commands/kill/Makefile
+++ b/commands/kill/Makefile
@@ -1,4 +1,4 @@
 PROG=  kill
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/last/Makefile b/commands/last/Makefile
index ffb7ca37b529fd835cb9fb162f82a3aab61aa489..44f1993776274e463f1e05a09c4d94c6bb2ae205 100644 (file)
--- a/commands/last/Makefile
+++ b/commands/last/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/last ${BINDIR}/uptime
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/leave/Makefile b/commands/leave/Makefile
index e2d62d1feb269790fc5ddcdc5a2547895e1ff518..395f25070b101c88520296dce1978d3c7250bffe 100644 (file)
--- a/commands/leave/Makefile
+++ b/commands/leave/Makefile
@@ -1,4 +1,4 @@
 PROG=  leave
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/lex/Makefile b/commands/lex/Makefile
index 6d0d996309aba0ce41923273f78097ef44274b9a..3bdad8b77c103942fbbb229f26e58252b66e04ec 100644 (file)
--- a/commands/lex/Makefile
+++ b/commands/lex/Makefile
@@ -41,4 +41,4 @@ scan.c: scan.l
 
 scan.o yylex.o: parse.h
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/life/Makefile b/commands/life/Makefile
index 3e62b057fbddc00da5b693b69273ec6319e558bf..43e00bda434890062ea5ad7a5901391ed9a6d8f7 100644 (file)
--- a/commands/life/Makefile
+++ b/commands/life/Makefile
@@ -4,4 +4,4 @@ MAN=
 DPADD+= ${LIBCURSES}
 LDADD+= -lcurses
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/loadfont/Makefile b/commands/loadfont/Makefile
index 39b865cf83ac66dfad14c77bb1d59a413a2dad86..8e64875c58b61caedb715be3b11cd9240718285d 100644 (file)
--- a/commands/loadfont/Makefile
+++ b/commands/loadfont/Makefile
@@ -1,4 +1,4 @@
 PROG=  loadfont
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/loadkeys/Makefile b/commands/loadkeys/Makefile
index edb2fb3fcfbac5d663a89e9e4f6526122f34acd3..5f24f23285449d1d88b81c07a9b8ed1aec789746 100644 (file)
--- a/commands/loadkeys/Makefile
+++ b/commands/loadkeys/Makefile
@@ -2,4 +2,4 @@ PROG=   loadkeys
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/loadramdisk/Makefile b/commands/loadramdisk/Makefile
index edecb68ee5718ab5cc8a733e148b5607637571dc..7f19f90dd0f13a40bd59103137f5a326347f8977 100644 (file)
--- a/commands/loadramdisk/Makefile
+++ b/commands/loadramdisk/Makefile
@@ -1,4 +1,4 @@
 PROG=  loadramdisk
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/logger/Makefile b/commands/logger/Makefile
index e12d044ab33d1acad81000c68160b900ee4fbcb9..ac8698341b8f3698df2f75b485d19b02f2216ecf 100644 (file)
--- a/commands/logger/Makefile
+++ b/commands/logger/Makefile
@@ -1,4 +1,4 @@
 PROG=  logger
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/login/Makefile b/commands/login/Makefile
index 6d9a5432ef72770677af5172e953d335ddddb08e..687f04b3958456d5b4bf36a62dee98d84a545911 100644 (file)
--- a/commands/login/Makefile
+++ b/commands/login/Makefile
@@ -1,4 +1,4 @@
 PROG=  login
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/look/Makefile b/commands/look/Makefile
index c038d231bea039c63004b89c08bd63a5611b04ba..e4e0f7196f9ea6d60d198f59d7a2d7603ff6762e 100644 (file)
--- a/commands/look/Makefile
+++ b/commands/look/Makefile
@@ -1,4 +1,4 @@
 PROG=  look
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/lp/Makefile b/commands/lp/Makefile
index ba7f2b43facef0f0e6c9b64afd8b8eeb7cdc476f..e0c1d933c2a72a4573115ee3881515861796f88a 100644 (file)
--- a/commands/lp/Makefile
+++ b/commands/lp/Makefile
@@ -1,4 +1,4 @@
 PROG=  lp
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/lpd/Makefile b/commands/lpd/Makefile
index 82bc5f19f3af519a763ec35d46870d0f0c3c2199..77edc24eae8cb90b8734a115b863bba26610eb07 100644 (file)
--- a/commands/lpd/Makefile
+++ b/commands/lpd/Makefile
@@ -3,4 +3,4 @@ BINOWN= daemon
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ls/Makefile b/commands/ls/Makefile
index 08eedb9c4e55461facae724e5c546a351995fbfb..d3d12a065aee4b5b6ff1ef52769b6adee0ce4fe7 100644 (file)
--- a/commands/ls/Makefile
+++ b/commands/ls/Makefile
@@ -2,4 +2,4 @@ PROG=   ls
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/lspci/Makefile b/commands/lspci/Makefile
index 638c31c3f6213ab1571509cf5124a5010631cef6..aed9e34a34e09d6405292859964585fe4aab81e2 100644 (file)
--- a/commands/lspci/Makefile
+++ b/commands/lspci/Makefile
@@ -1,4 +1,4 @@
 PROG=  lspci
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/m4/Makefile b/commands/m4/Makefile
index cdbd194ce89e99f7c66c4f29a9b9fcad412e1b84..38f49b22a48b97d0adf0c8efab3fab9748fc1583 100644 (file)
--- a/commands/m4/Makefile
+++ b/commands/m4/Makefile
@@ -11,4 +11,4 @@ SRCS=         main.c eval.c serv.c look.c misc.c expr.c
 CPPFLAGS+= -DEXTENDED
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mail/Makefile b/commands/mail/Makefile
index e4ed4f473a8485777e6d3b915386bd9997476ebe..b7f35183f047d297704edca47ae8416dab753b62 100644 (file)
--- a/commands/mail/Makefile
+++ b/commands/mail/Makefile
@@ -2,4 +2,4 @@ PROG=   mail
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/make/Makefile b/commands/make/Makefile
index a7d90e3b5e2cb5bb8d410667677b0b3b7a6b3c5f..f837ec73f80c5714a730791a0aa255d06f5a7302 100644 (file)
--- a/commands/make/Makefile
+++ b/commands/make/Makefile
@@ -30,8 +30,8 @@ CPPFLAGS+= -DTARGET_MACHINE=\"${MACHINE}\" \
 # SUBDIR+= unit-tests
 # .endif
 
-.include <minix.prog.mk>
-.include <minix.subdir.mk>
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
 
 # A simple unit-test driver to help catch regressions
 accept test:

diff --git a/commands/make/unit-tests/Makefile b/commands/make/unit-tests/Makefile
index cbce3742015503a5d3a83205c787c306123cdfcc..b3fd0a8185d6b108ce993725e8fe4af19d001355 100644 (file)
--- a/commands/make/unit-tests/Makefile
+++ b/commands/make/unit-tests/Makefile
@@ -49,7 +49,7 @@ ${SUBFILES}:
 clean:
        rm -f *.out *.fail *.core
 
-.include <minix.obj.mk>
+.include <bsd.obj.mk>
 
 TEST_MAKE?= ${.MAKE}
 

diff --git a/commands/makewhatis/Makefile b/commands/makewhatis/Makefile
index 9fb595155c4afc53ce328f46c1439df9e0cdc1b5..08bbbfb4a9f2ea786846a3bcf5ae3641741615a5 100644 (file)
--- a/commands/makewhatis/Makefile
+++ b/commands/makewhatis/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= makewhatis.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/man/Makefile b/commands/man/Makefile
index 1388ec18b19b746a073734b30e7f833cbe3dd115..eb8e2f91b1f2ad0beb57120588777f46973a2e5e 100644 (file)
--- a/commands/man/Makefile
+++ b/commands/man/Makefile
@@ -1,4 +1,4 @@
 PROG=  man
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mdb/Makefile b/commands/mdb/Makefile
index 6376e36bfe4b377eeef851a638c24cb5e6e1083a..dd520620cf639c7ead46d291ffa6fa03ecd1ed91 100644 (file)
--- a/commands/mdb/Makefile
+++ b/commands/mdb/Makefile
@@ -26,4 +26,4 @@ SRCS= mdb.c mdbexp.c kernel.o sym.c trace.c core.c misc.c io.c
 SRCS+= mdbdis86.c
 SRCS+= ${EXTRA_SRCS}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mesg/Makefile b/commands/mesg/Makefile
index 029992d25df190c7feffbe597d0c38a7dc551b83..c42437163ccafc976bc4434804483c88c98f776a 100644 (file)
--- a/commands/mesg/Makefile
+++ b/commands/mesg/Makefile
@@ -1,4 +1,4 @@
 PROG=  mesg
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mined/Makefile b/commands/mined/Makefile
index f0d68dd6a4126f4aa80cbfdd7fac1e6356013c60..891b60b58643e9f6c3de4524381497937bfdf403 100644 (file)
--- a/commands/mined/Makefile
+++ b/commands/mined/Makefile
@@ -4,4 +4,4 @@ PROG=   mined
 SRCS=  mined1.c mined2.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mixer/Makefile b/commands/mixer/Makefile
index fdfc78f879de782c8450ea3b730cc22a356955cf..306ca146f887933eb52f7346177a9b1eb50634e1 100644 (file)
--- a/commands/mixer/Makefile
+++ b/commands/mixer/Makefile
@@ -4,4 +4,4 @@ MAN=
 DPADD+= ${LIBCURSES}
 LDADD+= -lcurses
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkdep/Makefile b/commands/mkdep/Makefile
index e93a17e440065d1df8671ecb7b02c3360fd82f2e..326932b71c56ac514aeb866a7344724a14b95bc2 100644 (file)
--- a/commands/mkdep/Makefile
+++ b/commands/mkdep/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= mkdep.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkdir/Makefile b/commands/mkdir/Makefile
index e22f80fe6c55f4b6cc2af736de1de1c45a9d198b..31dcaaef72959a8270dee6c64316e87986303a1e 100644 (file)
--- a/commands/mkdir/Makefile
+++ b/commands/mkdir/Makefile
@@ -1,4 +1,4 @@
 PROG=  mkdir
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkdist/Makefile b/commands/mkdist/Makefile
index c096ca2d30c9fe7a23821fdd3080443ed1b589b0..b9f842c5564b55a11ea485907f197922509d69cd 100644 (file)
--- a/commands/mkdist/Makefile
+++ b/commands/mkdist/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= mkdist.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkfifo/Makefile b/commands/mkfifo/Makefile
index 939efc0ed74333618498009dfdf2482e0a9d8bc8..cc8aa9fddc26672eb7e858db88d05fc639f5a90d 100644 (file)
--- a/commands/mkfifo/Makefile
+++ b/commands/mkfifo/Makefile
@@ -1,4 +1,4 @@
 PROG=  mkfifo
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkfs/Makefile b/commands/mkfs/Makefile
index eb3c040ab96d675569d699e89e8e2730894c4a49..c688a17fa5a62b99667fe9333910d8e4517ade3f 100644 (file)
--- a/commands/mkfs/Makefile
+++ b/commands/mkfs/Makefile
@@ -2,4 +2,4 @@ PROG=   mkfs
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mknod/Makefile b/commands/mknod/Makefile
index 8fd1b28a3602eb89c227383d82092db6359a0685..fe1ab212e54f3047c47398d35e81190f292226fb 100644 (file)
--- a/commands/mknod/Makefile
+++ b/commands/mknod/Makefile
@@ -1,4 +1,4 @@
 PROG=  mknod
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mkproto/Makefile b/commands/mkproto/Makefile
index aae445f7cf27a0351cd36cb7d44415ced8bec5ed..baa5da16cf889f2abcc5f58312705f3b3406f4d9 100644 (file)
--- a/commands/mkproto/Makefile
+++ b/commands/mkproto/Makefile
@@ -1,4 +1,4 @@
 PROG=  mkproto
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/modem/Makefile b/commands/modem/Makefile
index 5ff37d6c3552b2b3df0687add7944ce917f468a0..b106fc1c911d02c893af7559fc50b6ff42db732b 100644 (file)
--- a/commands/modem/Makefile
+++ b/commands/modem/Makefile
@@ -1,4 +1,4 @@
 PROG=  modem
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mount/Makefile b/commands/mount/Makefile
index 9ffcd57a96b97975925926cb7fed26280c5dacba..cc76d2e478ef2d5484347e28e944044ef911936e 100644 (file)
--- a/commands/mount/Makefile
+++ b/commands/mount/Makefile
@@ -4,4 +4,4 @@ BINDIR= /bin
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/mt/Makefile b/commands/mt/Makefile
index beff6bce8f832bbe5260185cdf59994539aec33e..1aa8c53bc300860f487db0413e63f037fedaadba 100644 (file)
--- a/commands/mt/Makefile
+++ b/commands/mt/Makefile
@@ -1,4 +1,4 @@
 PROG=  mt
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/netconf/Makefile b/commands/netconf/Makefile
index 8fe58ea0636eac1c33534c423d43c49ff51433a9..8a30ab1fd9c3ae433cca385a3ae14e805aeb55f0 100644 (file)
--- a/commands/netconf/Makefile
+++ b/commands/netconf/Makefile
@@ -2,4 +2,4 @@ SCRIPTS= netconf.sh
 BINDIR= /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/newroot/Makefile b/commands/newroot/Makefile
index a9aa24e535f068f65d48ba89e2bbf5cb29e4dee9..db80764d03b1ba2b23e81d52ff8ec2f977a79c20 100644 (file)
--- a/commands/newroot/Makefile
+++ b/commands/newroot/Makefile
@@ -1,4 +1,4 @@
 PROG=  newroot
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/nice/Makefile b/commands/nice/Makefile
index 0a74c57946d328aa986b59f06f111b155a614f57..e784436f1d0e2a5d5e772168e064e1b42f080de5 100644 (file)
--- a/commands/nice/Makefile
+++ b/commands/nice/Makefile
@@ -1,4 +1,4 @@
 PROG=  nice
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/nm/Makefile b/commands/nm/Makefile
index eec0c1c84cdfcecb03ae643e21e9908df0790655..0ecdc98a57cf7807cc3054dae9a3ca541f11f86e 100644 (file)
--- a/commands/nm/Makefile
+++ b/commands/nm/Makefile
@@ -1,4 +1,4 @@
 PROG=  nm
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/nohup/Makefile b/commands/nohup/Makefile
index e54770f35d3f66095def56c6f818f3c993fa621a..184172b0f21f0ff218c8c54e873a8e776b7405d3 100644 (file)
--- a/commands/nohup/Makefile
+++ b/commands/nohup/Makefile
@@ -1,4 +1,4 @@
 PROG=  nohup
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/nonamed/Makefile b/commands/nonamed/Makefile
index 4bfc49000397507aa548813e5272d3cb32ec8866..251068e7895cb6824977c696033d4c317b5ede32 100644 (file)
--- a/commands/nonamed/Makefile
+++ b/commands/nonamed/Makefile
@@ -1,4 +1,4 @@
 PROG=  nonamed
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/od/Makefile b/commands/od/Makefile
index e3960c0f7679a4a6df14cce5775e652e47228695..dac693a6a0ebdc013c07f191700a089875f65101 100644 (file)
--- a/commands/od/Makefile
+++ b/commands/od/Makefile
@@ -1,4 +1,4 @@
 PROG=  od
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/packit/Makefile b/commands/packit/Makefile
index 272790ce101e2c9e755c2ae3882a51d2545f90bd..80456f89a1a5eb59ed2d31be429755577cc5ab6b 100644 (file)
--- a/commands/packit/Makefile
+++ b/commands/packit/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= packit.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/packman/Makefile b/commands/packman/Makefile
index d31a06d36bee88504d9e837a413d0eac10e3dc47..23730e9c68b8ae6b4533b0d4416a01bcdfb50baf 100644 (file)
--- a/commands/packman/Makefile
+++ b/commands/packman/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= packman.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/part/Makefile b/commands/part/Makefile
index d8fe20c6174271440f9d9c285eb8d57e5104a80e..6106023ddd663b537cbc46dcfcdeb13e8468fc79 100644 (file)
--- a/commands/part/Makefile
+++ b/commands/part/Makefile
@@ -1,4 +1,4 @@
 PROG=  part
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/partition/Makefile b/commands/partition/Makefile
index 813c531ba579632033f8cf4fbd43c5ed454f7cc9..0440d911e010fa2a42749bcdce3526455764ae6b 100644 (file)
--- a/commands/partition/Makefile
+++ b/commands/partition/Makefile
@@ -1,4 +1,4 @@
 PROG=  partition
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/passwd/Makefile b/commands/passwd/Makefile
index 69d98acf50640d11e3973d55247cb6c81247ee20..fb0c6644351c44b310e4fbfa1533c470959268c9 100644 (file)
--- a/commands/passwd/Makefile
+++ b/commands/passwd/Makefile
@@ -5,4 +5,4 @@ MAN=
 LINKS+=      ${BINDIR}/passwd ${BINDIR}/chsh
 LINKS+=      ${BINDIR}/passwd ${BINDIR}/chfn
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/paste/Makefile b/commands/paste/Makefile
index 8cabf277770fd9baab4a4d0e6e3177dc0bacaca3..c72cce9dad03331eefb0a09af8b9bc09220b9cef 100644 (file)
--- a/commands/paste/Makefile
+++ b/commands/paste/Makefile
@@ -1,4 +1,4 @@
 PROG=  paste
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/patch/Makefile b/commands/patch/Makefile
index 7485f1185f9489eaa2aadce820bddecda047dc0d..07fa57688595b7edac6b63a964d69f47c148b846 100644 (file)
--- a/commands/patch/Makefile
+++ b/commands/patch/Makefile
@@ -5,4 +5,4 @@
 PROG=  patch
 SRCS=  patch.c pch.c inp.c util.c backupfile.c mkpath.c
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/pax/Makefile b/commands/pax/Makefile
index 9292832d7318f1df98d5426cb7dfd40544f20812..53f485238c6bc596313d8e0f0e74ba00cf7208ea 100644 (file)
--- a/commands/pax/Makefile
+++ b/commands/pax/Makefile
@@ -37,4 +37,4 @@ LINKS+= ${BINDIR}/pax ${BINDIR}/cpio
 
 CPPFLAGS+= -DNET2_STAT=1
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ping/Makefile b/commands/ping/Makefile
index a948e21a2d622af3ec18524328de889473110e1d..9fb8d1f47f3121bc41adc48843aaf749bb37c3c4 100644 (file)
--- a/commands/ping/Makefile
+++ b/commands/ping/Makefile
@@ -2,4 +2,4 @@ PROG=   ping
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/playwave/Makefile b/commands/playwave/Makefile
index 37ad5a3b1e93584b5df111c0cb622487c4ee076e..d11f8fb00976d893299f2f41e16e05573f8414d1 100644 (file)
--- a/commands/playwave/Makefile
+++ b/commands/playwave/Makefile
@@ -1,4 +1,4 @@
 PROG=  playwave
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/postinstall/Makefile b/commands/postinstall/Makefile
index 4f46bdfa4361a1f34d1c7014d8e2392a938620be..485cf02136243ee60d2bb941c8929b2d5c3290b4 100644 (file)
--- a/commands/postinstall/Makefile
+++ b/commands/postinstall/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= postinstall.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/postmort/Makefile b/commands/postmort/Makefile
index 54601ddca6e776e518951e5b98c3f2c2d491cd32..00b74f55a46bc51516d88b0a87c702ea15661b74 100644 (file)
--- a/commands/postmort/Makefile
+++ b/commands/postmort/Makefile
@@ -2,4 +2,4 @@ PROG=   postmort
 CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/poweroff/Makefile b/commands/poweroff/Makefile
index e3d54d43ef36ed70849bcc6635b42d271454d7c4..5af305f7954d7836ab74a482e89d229d2fa0e0bd 100644 (file)
--- a/commands/poweroff/Makefile
+++ b/commands/poweroff/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= poweroff.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/pr/Makefile b/commands/pr/Makefile
index 577582ada6908c65a33e5d54be622c5e484e195d..d362de26190d4dda6a88698d16ddaf708dc57f5a 100644 (file)
--- a/commands/pr/Makefile
+++ b/commands/pr/Makefile
@@ -1,4 +1,4 @@
 PROG=  pr
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/pr_routes/Makefile b/commands/pr_routes/Makefile
index 193c33e5ca856da964aac18b92e7a128a77434ce..e5834fa8d52e84f543b0100cd32cb86e1ef47ba7 100644 (file)
--- a/commands/pr_routes/Makefile
+++ b/commands/pr_routes/Makefile
@@ -2,4 +2,4 @@ PROG=   pr_routes
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/prep/Makefile b/commands/prep/Makefile
index 0250ede19828c0c35b6c45ca026d00af51e4ca95..eef68c6646c30f3c11ae6dc083dbe073edf9968d 100644 (file)
--- a/commands/prep/Makefile
+++ b/commands/prep/Makefile
@@ -1,4 +1,4 @@
 PROG=  prep
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/printf/Makefile b/commands/printf/Makefile
index 3ec157fd0b6fed39feed8675d38cbc0871adf4af..67169b90ad4ed181664fc04e19f3b80e96c5cb2f 100644 (file)
--- a/commands/printf/Makefile
+++ b/commands/printf/Makefile
@@ -3,4 +3,4 @@
 
 PROG=  printf
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/printroot/Makefile b/commands/printroot/Makefile
index 63939c75eb2f26079c3edc4e42a4ca3a3ab6d31e..92f1bda09d3ca84c17cd6f622212c8c1b075f907 100644 (file)
--- a/commands/printroot/Makefile
+++ b/commands/printroot/Makefile
@@ -2,4 +2,4 @@ PROG=   printroot
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/profile/Makefile b/commands/profile/Makefile
index bcf6eef45c93689a9c032f0ae78700afe6a664da..2d6dc1df3d73b2acf9f5f9acb204dccd2016eb2a 100644 (file)
--- a/commands/profile/Makefile
+++ b/commands/profile/Makefile
@@ -4,4 +4,4 @@ PROG=           profile
 SCRIPTS=       sprofalyze.pl cprofalyze.pl
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/progressbar/Makefile b/commands/progressbar/Makefile
index cb6efea04668b8adf18d1ba0805e810dd1588f95..789359755e0f80de1d733aded6d87a82c9d8d17c 100644 (file)
--- a/commands/progressbar/Makefile
+++ b/commands/progressbar/Makefile
@@ -1,4 +1,4 @@
 PROG=  progressbar
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/proto/Makefile b/commands/proto/Makefile
index 3626141a5e39dae0430dadaa20c5c02131aefbef..3163107304b0df1000e2e6f6ff17dad60c8444df 100644 (file)
--- a/commands/proto/Makefile
+++ b/commands/proto/Makefile
@@ -1,4 +1,4 @@
 PROG=  proto
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ps/Makefile b/commands/ps/Makefile
index f79d1e1169b50b257ce91aac9f451ff8111fecdb..61ef3f6847ee16932f880863f290c705a45bfe16 100644 (file)
--- a/commands/ps/Makefile
+++ b/commands/ps/Makefile
@@ -6,4 +6,4 @@ CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/pwd/Makefile b/commands/pwd/Makefile
index 27fe9fe29efd7f96d1ee4c4c397fafba5c355d36..bcf0484e2c5bc6d885dbfe6924390698a59d2fc1 100644 (file)
--- a/commands/pwd/Makefile
+++ b/commands/pwd/Makefile
@@ -2,4 +2,4 @@ PROG=   pwd
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/pwdauth/Makefile b/commands/pwdauth/Makefile
index f3c98a5be88562962b961c310199aaea9b41eb14..8f6dbe745f442c33dc05cbd08967b83140269865 100644 (file)
--- a/commands/pwdauth/Makefile
+++ b/commands/pwdauth/Makefile
@@ -3,4 +3,4 @@ BINDIR= /usr/lib
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ramdisk/Makefile b/commands/ramdisk/Makefile
index 3d6e5f44260a897fcb0777e54133de1f49ddafeb..32394870fb9fdd76156e6257367136537f6eef99 100644 (file)
--- a/commands/ramdisk/Makefile
+++ b/commands/ramdisk/Makefile
@@ -1,4 +1,4 @@
 PROG=  ramdisk
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rarpd/Makefile b/commands/rarpd/Makefile
index 99922c80a6595296da0d7d0579188f4b77a31b78..6a54de2f19c3dbed8c31b225e544a476bc4cec98 100644 (file)
--- a/commands/rarpd/Makefile
+++ b/commands/rarpd/Makefile
@@ -1,4 +1,4 @@
 PROG=  rarpd
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rawspeed/Makefile b/commands/rawspeed/Makefile
index f55461f4459e92222050ceb31dc73d5dac346dd1..3d75a42df4620a8afac071169d8bbfb7157c86ea 100644 (file)
--- a/commands/rawspeed/Makefile
+++ b/commands/rawspeed/Makefile
@@ -1,4 +1,4 @@
 PROG=  rawspeed
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rcp/Makefile b/commands/rcp/Makefile
index 99ba5413b461f8a09e761ae58f1af9646da13cce..4286e5102d65783af402c46f6fb15faab6b81349 100644 (file)
--- a/commands/rcp/Makefile
+++ b/commands/rcp/Makefile
@@ -1,4 +1,4 @@
 PROG=  rcp
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rdate/Makefile b/commands/rdate/Makefile
index 792d783dbd177ebd427b6e3afc2669ef0df2603a..4483ce7c1652e2d5752a58c458895153466250ab 100644 (file)
--- a/commands/rdate/Makefile
+++ b/commands/rdate/Makefile
@@ -1,4 +1,4 @@
 PROG=  rdate
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/readall/Makefile b/commands/readall/Makefile
index a6cafa65b5ba10b6fac98061c918a852b1202513..a5c7c79626d81a6b2160556b12cb187a5e035b9a 100644 (file)
--- a/commands/readall/Makefile
+++ b/commands/readall/Makefile
@@ -1,4 +1,4 @@
 PROG=  readall
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/readclock/Makefile b/commands/readclock/Makefile
index 4f4c6c9295c27eaf3e1f8582d4c938e24fef1985..813483e906af1524258ca34dc776b80fde6a0314 100644 (file)
--- a/commands/readclock/Makefile
+++ b/commands/readclock/Makefile
@@ -2,4 +2,4 @@ SCRIPTS= readclock.sh
 BINDIR= /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/readfs/Makefile b/commands/readfs/Makefile
index aa6ba15c0c44cbeb750f220eedad26828795275b..df3acb7e32ee36161832634f6410d73f55088de5 100644 (file)
--- a/commands/readfs/Makefile
+++ b/commands/readfs/Makefile
@@ -2,4 +2,4 @@ PROG=   readfs
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/reboot/Makefile b/commands/reboot/Makefile
index 203688efbef75e582ad00a222f1db57c7e66dca2..44da118ccd74c5eefec8ed189b567f7f719c467d 100644 (file)
--- a/commands/reboot/Makefile
+++ b/commands/reboot/Makefile
@@ -8,4 +8,4 @@ LINKS+= ${BINDIR}/halt ${BINDIR}/reboot
 MAN.shutdown=
 MAN.halt=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/recwave/Makefile b/commands/recwave/Makefile
index ff0508b6fcb620d4afc7f9d37c9fce9c886d0f09..a0bf13198606a04879d75ebad5f6332e645f77ac 100644 (file)
--- a/commands/recwave/Makefile
+++ b/commands/recwave/Makefile
@@ -1,4 +1,4 @@
 PROG=  recwave
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/remsync/Makefile b/commands/remsync/Makefile
index b94cdc8550fe0cd1cf0d6583e6c3f9cfe029a153..5a1a161c7aaafaa79406fd573bbe56700902edd4 100644 (file)
--- a/commands/remsync/Makefile
+++ b/commands/remsync/Makefile
@@ -1,4 +1,4 @@
 PROG=  remsync
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/repartition/Makefile b/commands/repartition/Makefile
index d97bafd4c77a28f3e80987e9c56d1c2616787f3a..08321c12e5e8f508ade82c2e8c90e71ae28dc0e6 100644 (file)
--- a/commands/repartition/Makefile
+++ b/commands/repartition/Makefile
@@ -1,4 +1,4 @@
 PROG=  repartition
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rev/Makefile b/commands/rev/Makefile
index 5e68f4532325f52317627dbbe855e28ac16c8212..f6a3526ac2d9b9a9c2fe2218bb881c9898e9346c 100644 (file)
--- a/commands/rev/Makefile
+++ b/commands/rev/Makefile
@@ -1,4 +1,4 @@
 PROG=  rev
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rget/Makefile b/commands/rget/Makefile
index 4cfde77c935dffbd2ba15f7e95cf5848f9d809cb..152c89177f5d8d82f4566cb60358cce833a5157f 100644 (file)
--- a/commands/rget/Makefile
+++ b/commands/rget/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/rget ${BINDIR}/rput
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rlogin/Makefile b/commands/rlogin/Makefile
index 6a702ab1f6a22d48c813941f7a6e98e3ade98602..2cb2186b1a1cbaeea70f53208a380f56edf8cbed 100644 (file)
--- a/commands/rlogin/Makefile
+++ b/commands/rlogin/Makefile
@@ -1,4 +1,4 @@
 PROG=  rlogin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rlogind/Makefile b/commands/rlogind/Makefile
index 5547a1fdc83d370fe2f0455f457a98790e988470..b52766431ac177fae1cf3f2055cb63970f541301 100644 (file)
--- a/commands/rlogind/Makefile
+++ b/commands/rlogind/Makefile
@@ -4,4 +4,4 @@ PROG=           in.rlogind
 SRCS=          rlogind.c setup.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rmdir/Makefile b/commands/rmdir/Makefile
index 6ffc42664c1ed5ef23cb4f46cd79142ca8eb0a93..6727bd9fb020fe4c78b5db3c5952c746fabe5227 100644 (file)
--- a/commands/rmdir/Makefile
+++ b/commands/rmdir/Makefile
@@ -1,4 +1,4 @@
 PROG=  rmdir
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rotate/Makefile b/commands/rotate/Makefile
index cf6098f2a25d75a6a5ab348837bcb0408f556496..b59ba3e5fb9315de394b9efbbf32c0b0e87722cc 100644 (file)
--- a/commands/rotate/Makefile
+++ b/commands/rotate/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= rotate.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rsh/Makefile b/commands/rsh/Makefile
index 9b97026f08301166b1d136379651595abf111306..cfcddfab632c2c413dcb96dcddb49adbb210055c 100644 (file)
--- a/commands/rsh/Makefile
+++ b/commands/rsh/Makefile
@@ -1,4 +1,4 @@
 PROG=  rsh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/rshd/Makefile b/commands/rshd/Makefile
index 3984bf1d40a340e06f5d71e055416bad097af719..cb47a3d90ffc2f0bd5a5563180552a16684c3986 100644 (file)
--- a/commands/rshd/Makefile
+++ b/commands/rshd/Makefile
@@ -2,4 +2,4 @@ PROG=   in.rshd
 SRCS=  rshd.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/screendump/Makefile b/commands/screendump/Makefile
index 328fb7d369cee984879c27636228439175ffde72..c0e1fb210ca3e2327c5176a75efe020ab0d80cfe 100644 (file)
--- a/commands/screendump/Makefile
+++ b/commands/screendump/Makefile
@@ -1,4 +1,4 @@
 PROG=  screendump
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sdump/Makefile b/commands/sdump/Makefile
index 03fec687dab753cfaee7035aabeb091fdafc8cc7..cf6177c14bdd19fabbc8ed4e33738dcfa6e31b6e 100644 (file)
--- a/commands/sdump/Makefile
+++ b/commands/sdump/Makefile
@@ -2,4 +2,4 @@ PROG=   sdump
 CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sed/Makefile b/commands/sed/Makefile
index 0addb8171f862c1451a9ffac0990947ce5a8f4dd..cce11ad6ef000d43ea8dd098895476015c198440 100644 (file)
--- a/commands/sed/Makefile
+++ b/commands/sed/Makefile
@@ -1,11 +1,11 @@
 #      $NetBSD: Makefile,v 1.13 2006/06/02 19:44:48 mrg Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  sed
 SRCS=  compile.c main.c misc.c process.c
 
 BINDIR=/bin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/service/Makefile b/commands/service/Makefile
index 637f02e1c687ba467abd582dfdbcef8c86f75a10..5227220fc7900f6d9e90f5f88c25cd00cb10f9a4 100644 (file)
--- a/commands/service/Makefile
+++ b/commands/service/Makefile
@@ -4,4 +4,4 @@ PROG=   service
 BINDIR= /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/setup/Makefile b/commands/setup/Makefile
index a78a13ba3852a53a6b36ed85fc6d58b8e778c704..763d617165368b8a7dbfc14a6c7358cc59064488 100644 (file)
--- a/commands/setup/Makefile
+++ b/commands/setup/Makefile
@@ -2,4 +2,4 @@ SCRIPTS= setup.sh
 BINDIR= /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/shar/Makefile b/commands/shar/Makefile
index db7387d87cba64523352bc1901f605f2b0463bb7..f9ddb1248ba576997ecc0ee78d17b9f84d1e65f1 100644 (file)
--- a/commands/shar/Makefile
+++ b/commands/shar/Makefile
@@ -1,4 +1,4 @@
 PROG=  shar
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/size/Makefile b/commands/size/Makefile
index 791a877c396d4ba96fc7c3c360630747a30f3fc5..f3e34b96cad41746c83f68c16da35926f26fce37 100644 (file)
--- a/commands/size/Makefile
+++ b/commands/size/Makefile
@@ -1,4 +1,4 @@
 PROG=  size
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sleep/Makefile b/commands/sleep/Makefile
index 3c398c1c1899f19f61b3f968d5644adf0c2c1730..fdbf1267f67662604795538fce16ee4c65e6b7c7 100644 (file)
--- a/commands/sleep/Makefile
+++ b/commands/sleep/Makefile
@@ -1,4 +1,4 @@
 PROG=  sleep
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/slip/Makefile b/commands/slip/Makefile
index 9132a9ab416b7ac8abad9a70d2318342129a0efa..a6e745f39fd476de70512c266da1c753ca18c036 100644 (file)
--- a/commands/slip/Makefile
+++ b/commands/slip/Makefile
@@ -1,4 +1,4 @@
 PROG=  slip
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sort/Makefile b/commands/sort/Makefile
index 4dc558e0c39aeee1a60cb52379a9428250229025..53f36ee24778406c1cba8c44fda205411dee1c20 100644 (file)
--- a/commands/sort/Makefile
+++ b/commands/sort/Makefile
@@ -1,4 +1,4 @@
 PROG=  sort
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/spell/Makefile b/commands/spell/Makefile
index d1e3acf94cdbfb1ca89444485381d3ef2e91b315..a899cff059eec7bb3a0fb6a907fa525b5335b9d3 100644 (file)
--- a/commands/spell/Makefile
+++ b/commands/spell/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= spell.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/split/Makefile b/commands/split/Makefile
index 6000d45cb7b924672220d687379377bbcb73aa85..0ba292949c263335c0cc5e62ed6833b90bae4a46 100644 (file)
--- a/commands/split/Makefile
+++ b/commands/split/Makefile
@@ -1,4 +1,4 @@
 PROG=  split
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/srccrc/Makefile b/commands/srccrc/Makefile
index 1ecca6ae2036ed5e6869f562689a4c863c072594..5b1e2039ecaca595e89b4be24e1ba68f29d2e96a 100644 (file)
--- a/commands/srccrc/Makefile
+++ b/commands/srccrc/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= srccrc.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/stat/Makefile b/commands/stat/Makefile
index 5f32aa3b6e56dcded4ff455383b22d2cd685578e..b36e14d75bf1b74954e7cbfbe119071f6773b488 100644 (file)
--- a/commands/stat/Makefile
+++ b/commands/stat/Makefile
@@ -5,4 +5,4 @@ LINKS+=      ${BINDIR}/stat ${BINDIR}/readlink
 LINKS+=      ${BINDIR}/stat ${BINDIR}/fstat
 LINKS+=      ${BINDIR}/stat ${BINDIR}/lstat
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/strings/Makefile b/commands/strings/Makefile
index 23d43b8c4c499f103e7949ffc9512f6d3882a96e..76ea928306520e07711e3973b72df146cc1d5a6f 100644 (file)
--- a/commands/strings/Makefile
+++ b/commands/strings/Makefile
@@ -1,4 +1,4 @@
 PROG=  strings
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/strip/Makefile b/commands/strip/Makefile
index acba06683710e75097b3643a0fadeb93d243950a..1e28f4cd23f861921825da4c6ff7899e22ad43d6 100644 (file)
--- a/commands/strip/Makefile
+++ b/commands/strip/Makefile
@@ -1,4 +1,4 @@
 PROG=  strip
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/stty/Makefile b/commands/stty/Makefile
index a1aff7f41b6021b8891b565705310bbc5b420cd6..28670239b048ba5ea899066214584afbd9e15e1a 100644 (file)
--- a/commands/stty/Makefile
+++ b/commands/stty/Makefile
@@ -1,4 +1,4 @@
 PROG=  stty
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/su/Makefile b/commands/su/Makefile
index 35bc6f32d9d767205dee396e3ce57e7d13290141..798e15d106efb0ac5e947ba7e3360ab1dcf76513 100644 (file)
--- a/commands/su/Makefile
+++ b/commands/su/Makefile
@@ -2,4 +2,4 @@ PROG=   su
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sum/Makefile b/commands/sum/Makefile
index fad71518c64d35929ab1c3e263a8b0baa72f43b2..44530ce689fcc3cefa040c19ecea5dacf62b4893 100644 (file)
--- a/commands/sum/Makefile
+++ b/commands/sum/Makefile
@@ -1,4 +1,4 @@
 PROG=  sum
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/svclog/Makefile b/commands/svclog/Makefile
index a5f6155f886c9ab652fd8f4e183ad16ae000fb87..21ee49de389e65129eb3d3501636997f4bf1498b 100644 (file)
--- a/commands/svclog/Makefile
+++ b/commands/svclog/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= svclog.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/swapfs/Makefile b/commands/swapfs/Makefile
index 4cc5f18a84f1738fe2ffbd3d154593606f82d077..ea41986c432880b739cbf266017c610ebbd72acb 100644 (file)
--- a/commands/swapfs/Makefile
+++ b/commands/swapfs/Makefile
@@ -1,4 +1,4 @@
 PROG=  swapfs
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/swifi/Makefile b/commands/swifi/Makefile
index c10380328c835bdc697197d9c0c9585fedb93bbf..7e5ed483bb6d04ecd2755a7c2d7a0e222e041960 100644 (file)
--- a/commands/swifi/Makefile
+++ b/commands/swifi/Makefile
@@ -6,4 +6,4 @@ SRCS=   systest.c fault_model.c extra.c db_sym.c db_disasm.c \
 CPPFLAGS+= -DCONFIG_SWIFI
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sync/Makefile b/commands/sync/Makefile
index 3d9a01babda8e9f4b469f924ea8a753569a7a3ce..037c73196312d410f93ac1a1426119d642ae20af 100644 (file)
--- a/commands/sync/Makefile
+++ b/commands/sync/Makefile
@@ -2,4 +2,4 @@ PROG=   sync
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/synctree/Makefile b/commands/synctree/Makefile
index 3a67e1fee414a685ca749d358d906059efa4426b..305c01c357aac0c6133161e7ea7402057978312a 100644 (file)
--- a/commands/synctree/Makefile
+++ b/commands/synctree/Makefile
@@ -1,4 +1,4 @@
 PROG=  synctree
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/sysenv/Makefile b/commands/sysenv/Makefile
index 26fa396a0c9a8b4947986333d7b47f0ebbd25641..481b90185891c215926eca723306f5180a2d8db3 100644 (file)
--- a/commands/sysenv/Makefile
+++ b/commands/sysenv/Makefile
@@ -2,4 +2,4 @@ PROG=   sysenv
 BINDIR=        /bin
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/syslogd/Makefile b/commands/syslogd/Makefile
index 386579092703116bc49970f35f9e28887f19eeac..673395f41cb99f70aa8a94d92cb445c4d04a9d9d 100644 (file)
--- a/commands/syslogd/Makefile
+++ b/commands/syslogd/Makefile
@@ -10,4 +10,4 @@ CPPFLAGS+= -Ddebug=0 ${PIDFILE}
 BINMODE= 700
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tail/Makefile b/commands/tail/Makefile
index 6bbcd4df1afb3a692ca4757433188f6b83261c19..91982ec16ad5d9567616e9ba023ec07a10a48f35 100644 (file)
--- a/commands/tail/Makefile
+++ b/commands/tail/Makefile
@@ -1,4 +1,4 @@
 PROG=  tail
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/talk/Makefile b/commands/talk/Makefile
index 55cc1cc993d63846e139d1bb61a4cee9d8dd58d4..bc1d015ff0de8a95a269995b0465055acc33ca54 100644 (file)
--- a/commands/talk/Makefile
+++ b/commands/talk/Makefile
@@ -10,4 +10,4 @@ MAN=
 DPADD+= ${LIBCURSES}
 LDADD+= -lcurses
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/talkd/Makefile b/commands/talkd/Makefile
index f6da586941365c65363ce59bf5e7cfb57275eded..367e3692f54fa636822974ba0a482f86414d50f7 100644 (file)
--- a/commands/talkd/Makefile
+++ b/commands/talkd/Makefile
@@ -7,4 +7,4 @@ PROG=   talkd
 SRCS=  talkd.c net.c process.c finduser.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tcpd/Makefile b/commands/tcpd/Makefile
index e9f3f62ebf0b9f2f357de60383ef110976bdfc46..be91672d29a9fb9d4fc79b9d86d343b61f06f22f 100644 (file)
--- a/commands/tcpd/Makefile
+++ b/commands/tcpd/Makefile
@@ -2,4 +2,4 @@ PROG=   tcpd
 CPPFLAGS+= -DPARANOID=0
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tcpdp/Makefile b/commands/tcpdp/Makefile
index 3146a335e454715cb562455a34c0aaa5fb00e8d6..aa9f05f73225ea50ca5ec68ab55215478c543713 100644 (file)
--- a/commands/tcpdp/Makefile
+++ b/commands/tcpdp/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  tcpdp
 SRCS=  tcpd.c
@@ -7,4 +7,4 @@ MAN=
 
 .PATH: ${MINIXSRCDIR}/commands/tcpd
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tcpstat/Makefile b/commands/tcpstat/Makefile
index c21751eaa5176601ade954249886aaf41def116d..47dbc14bb8dbe7eefb8cfac85dbcb6980249cfcd 100644 (file)
--- a/commands/tcpstat/Makefile
+++ b/commands/tcpstat/Makefile
@@ -2,4 +2,4 @@ PROG=   tcpstat
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tee/Makefile b/commands/tee/Makefile
index a3e01556bd45c2b46719fef844d17535b53056c4..4949135423e2dc5944757be0a1487b729fbe155a 100644 (file)
--- a/commands/tee/Makefile
+++ b/commands/tee/Makefile
@@ -1,4 +1,4 @@
 PROG=  tee
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/telnet/Makefile b/commands/telnet/Makefile
index 38d93c70eb5e8ff20cb48d59d0070f75a860131f..c93dca90cb15a787e4cecfa6af9581dbda8369b2 100644 (file)
--- a/commands/telnet/Makefile
+++ b/commands/telnet/Makefile
@@ -4,4 +4,4 @@ PROG=   ttn
 SRCS=  ttn.c ttn_conf.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/telnetd/Makefile b/commands/telnetd/Makefile
index 310451a8bd3320be35fef5dabb757861acd0538d..88168ab6c95d9eff95464104e246b0b4439584b3 100644 (file)
--- a/commands/telnetd/Makefile
+++ b/commands/telnetd/Makefile
@@ -7,4 +7,4 @@ PROG=   in.telnetd
 SRCS=  main.c telnet.c term.c pty.c wtmp.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/term/Makefile b/commands/term/Makefile
index fa668ff7a0686bb77dee280cfdf423057d5481e5..126f7b2c7b075d44ff76b78789b39190a38dc2fa 100644 (file)
--- a/commands/term/Makefile
+++ b/commands/term/Makefile
@@ -3,4 +3,4 @@ BINGRP= uucp
 BINMODE= 2755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/termcap/Makefile b/commands/termcap/Makefile
index acaa95f69940aef66c89c6ac1232c6bae24942c7..285150307cd08cf8eb46604adb5151d1acdabdc9 100644 (file)
--- a/commands/termcap/Makefile
+++ b/commands/termcap/Makefile
@@ -1,4 +1,4 @@
 PROG=  termcap
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tget/Makefile b/commands/tget/Makefile
index a7dd19b4d49365a942f2feb61e0c1287efc09fc2..bb4e5def5efed336ecd3b5edf77d621e81cba994 100644 (file)
--- a/commands/tget/Makefile
+++ b/commands/tget/Makefile
@@ -1,4 +1,4 @@
 PROG=  tget
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/time/Makefile b/commands/time/Makefile
index 366d7e878ec753702b2fa5253911f01ed597f13b..34f79b86393e41d4656376f4b0ef99b6697e055f 100644 (file)
--- a/commands/time/Makefile
+++ b/commands/time/Makefile
@@ -1,4 +1,4 @@
 PROG=  time
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tinyhalt/Makefile b/commands/tinyhalt/Makefile
index 0db22c4ce6676b5ff8ea3a99465adef8b45ead3e..dc9daffcb7e0d448092fbcd3e11d02b6b85af3f5 100644 (file)
--- a/commands/tinyhalt/Makefile
+++ b/commands/tinyhalt/Makefile
@@ -1,6 +1,6 @@
 # Makefile for tinyhalt
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  halt
 SRCS=  tinyhalt.c
@@ -9,4 +9,4 @@ BINMODE= 744
 LINKS+=        ${BINDIR}/halt ${BINDIR}/reboot
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/top/Makefile b/commands/top/Makefile
index 1c3dfc815406015e6e76187a5347ffc9a190d535..a4d75ea35c84dd9732f91e01749cf0b3c14b8ece 100644 (file)
--- a/commands/top/Makefile
+++ b/commands/top/Makefile
@@ -6,4 +6,4 @@ MAN=
 DPADD+= ${LIBCURSES}
 LDADD+= -lcurses
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/touch/Makefile b/commands/touch/Makefile
index c641ea2d8f42ac9c9dbffa3a0d350a39c9de34d7..29eb115f8007024c44c96d3ee161f8b54d0d4abf 100644 (file)
--- a/commands/touch/Makefile
+++ b/commands/touch/Makefile
@@ -3,4 +3,4 @@
 
 PROG=  touch
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tr/Makefile b/commands/tr/Makefile
index 784afc3094da749089e97426fb598f547a620605..517d67ef329cb345d7d049b0fc36769cdf88d980 100644 (file)
--- a/commands/tr/Makefile
+++ b/commands/tr/Makefile
@@ -2,4 +2,4 @@ PROG=   tr
 SRCS=  tr.c str.c
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/truncate/Makefile b/commands/truncate/Makefile
index 5529a97dc750e9280b2b0ba17a124ccfc0072caf..a634f293cc2d17ced714c4df692dad6186310012 100644 (file)
--- a/commands/truncate/Makefile
+++ b/commands/truncate/Makefile
@@ -1,4 +1,4 @@
 PROG=  truncate
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tsort/Makefile b/commands/tsort/Makefile
index 861bc368a9a4b01aad33eb5c22d56ceca007e775..4a438ab72924b77ec0cffe6ee8d39e0c2fe44dd7 100644 (file)
--- a/commands/tsort/Makefile
+++ b/commands/tsort/Makefile
@@ -1,4 +1,4 @@
 PROG=  tsort
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/ttt/Makefile b/commands/ttt/Makefile
index 63c463c3db4272b4065efb3d1040d817165ce346..241c32ec87b8bc913790aa1d9b5e90528eaac712 100644 (file)
--- a/commands/ttt/Makefile
+++ b/commands/ttt/Makefile
@@ -1,4 +1,4 @@
 PROG=  ttt
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/tty/Makefile b/commands/tty/Makefile
index 165e296a6f2d64e0090a72737747ed565dda4b3e..1ff6ef0e815f542677a2f2ade37ed6d1f0a7a179 100644 (file)
--- a/commands/tty/Makefile
+++ b/commands/tty/Makefile
@@ -1,4 +1,4 @@
 PROG=  tty
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/udpstat/Makefile b/commands/udpstat/Makefile
index 1738ca3ac8e23713c82e56e6b1b23f51d8ef9263..20e6b79205a59b8cf78eb444b1f27258a64f3e36 100644 (file)
--- a/commands/udpstat/Makefile
+++ b/commands/udpstat/Makefile
@@ -2,4 +2,4 @@ PROG=   udpstat
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/umount/Makefile b/commands/umount/Makefile
index 61e13d10314e3059ee89d1d629e6249615ff3cc9..1f03c5a8396dbd15dc73d680d49718832b7adf02 100644 (file)
--- a/commands/umount/Makefile
+++ b/commands/umount/Makefile
@@ -3,4 +3,4 @@ BINDIR= /bin
 BINMODE= 4755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/uname/Makefile b/commands/uname/Makefile
index 2f82adc10fd8f74d3191792f66ad84db106217ad..1f96ebae1b89b7a479b057321feab4eeafeedc41 100644 (file)
--- a/commands/uname/Makefile
+++ b/commands/uname/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/uname ${BINDIR}/arch
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/unexpand/Makefile b/commands/unexpand/Makefile
index eb2a26f789bf5eabd193ff3281b2688bdf0f6ec4..ef5cf30459b2389940fdf85fd7d5f2074494bb17 100644 (file)
--- a/commands/unexpand/Makefile
+++ b/commands/unexpand/Makefile
@@ -1,4 +1,4 @@
 PROG=  unexpand
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/uniq/Makefile b/commands/uniq/Makefile
index b560bc6944bd79eb7a45a0b1865e15d7420213b0..25eeda7e21115c23be414a4836e2619112e80e38 100644 (file)
--- a/commands/uniq/Makefile
+++ b/commands/uniq/Makefile
@@ -1,4 +1,4 @@
 PROG=  uniq
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/unstack/Makefile b/commands/unstack/Makefile
index d6130f1e23596481489ec5b254ba0deeaedadade..13cbdce357a54a140c4747bd19bcb279dcbddf3a 100644 (file)
--- a/commands/unstack/Makefile
+++ b/commands/unstack/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= unstack.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/update/Makefile b/commands/update/Makefile
index b2f27d6087ddf0fa94c0c5fbcccac24610904ff4..687504e04c29db396f5cd7a15634a23e56925639 100644 (file)
--- a/commands/update/Makefile
+++ b/commands/update/Makefile
@@ -1,4 +1,4 @@
 PROG=  update
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/urlget/Makefile b/commands/urlget/Makefile
index d1a69bcd8a86b0ab8bd71a468a214a1cf799ed6c..f0fabcffbd9a671d5448dca664e31437b8c7ba67 100644 (file)
--- a/commands/urlget/Makefile
+++ b/commands/urlget/Makefile
@@ -9,4 +9,4 @@ LINKS+= ${BINDIR}/urlget ${BINDIR}/httpget
 LINKS+=        ${BINDIR}/urlget ${BINDIR}/ftpget
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/uud/Makefile b/commands/uud/Makefile
index 4a6fd7d7939d431abbabe696edabe1e3f4a4e044..793da4233854c43879456aa4074736ca793d9c83 100644 (file)
--- a/commands/uud/Makefile
+++ b/commands/uud/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/uud ${BINDIR}/uudecode
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/uue/Makefile b/commands/uue/Makefile
index bfaeddc78b70a3532511c1db0bfeb4c7baf4e0d4..0a08f937c9276961418479bd5de859f32a7cd4b9 100644 (file)
--- a/commands/uue/Makefile
+++ b/commands/uue/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=      ${BINDIR}/uue ${BINDIR}/uuencode
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/version/Makefile b/commands/version/Makefile
index a9c0c4bae0b264a35400bb136fa8e4ffe880e27e..1ba3219b62efa31cd6a3279e779f99fce19fb02b 100644 (file)
--- a/commands/version/Makefile
+++ b/commands/version/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= version.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/vol/Makefile b/commands/vol/Makefile
index 81616a30f30dfbd03537bec20ff9dfc97e7a357d..3ff08af7983607cc6790740b1e390fc27be5fcda 100644 (file)
--- a/commands/vol/Makefile
+++ b/commands/vol/Makefile
@@ -1,4 +1,4 @@
 PROG=  vol
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/wc/Makefile b/commands/wc/Makefile
index 4a6b226833695fcbc9b8936432c0cf15e65ca89d..9fba7b91ffb76d4ca4c04064a8da3c5e88e905ee 100644 (file)
--- a/commands/wc/Makefile
+++ b/commands/wc/Makefile
@@ -1,4 +1,4 @@
 PROG=  wc
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/whatis/Makefile b/commands/whatis/Makefile
index f01bac7fe28efc78bc9648747d07466a1329bec9..f3b191766735bde4acbcb2c2104ce46bc47cce84 100644 (file)
--- a/commands/whatis/Makefile
+++ b/commands/whatis/Makefile
@@ -3,4 +3,4 @@ MAN=
 
 LINKS+=        ${BINDIR}/whatis ${BINDIR}/apropos
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/whereis/Makefile b/commands/whereis/Makefile
index 744b2abc83770057b9815d340d731c188d6c100a..3b7bd9539c309acccad68c9fba87c44ad00543ef 100644 (file)
--- a/commands/whereis/Makefile
+++ b/commands/whereis/Makefile
@@ -1,4 +1,4 @@
 SCRIPTS= whereis.sh
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/which/Makefile b/commands/which/Makefile
index fb269d0d988f3a64729fe6c5aec565634aa2c4fc..97778e66a34e812048df70bbba720b340ef92217 100644 (file)
--- a/commands/which/Makefile
+++ b/commands/which/Makefile
@@ -1,4 +1,4 @@
 PROG=  which
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/who/Makefile b/commands/who/Makefile
index f4e6363fd91dedc9d40d45162c350729435587ae..34b50e4ad5cc12d3d054ec23ba2ec70af9e2369f 100644 (file)
--- a/commands/who/Makefile
+++ b/commands/who/Makefile
@@ -1,4 +1,4 @@
 PROG=  who
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/whoami/Makefile b/commands/whoami/Makefile
index afc37c8375a5955ce2e0be58c3d045085875727f..a53e128eee06b268cf8e893453b1a17a47103017 100644 (file)
--- a/commands/whoami/Makefile
+++ b/commands/whoami/Makefile
@@ -1,4 +1,4 @@
 PROG=  whoami
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/write/Makefile b/commands/write/Makefile
index c0dbac142c7580e24aeb379fbd6eee5a6d4ce211..e1e0e19bdd24b297f5e1dceacb28859fdfe8ccab 100644 (file)
--- a/commands/write/Makefile
+++ b/commands/write/Makefile
@@ -3,4 +3,4 @@ BINGRP= tty
 BINMODE= 2755
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/writeisofs/Makefile b/commands/writeisofs/Makefile
index b5bc18fa5cc2d7361d0826ae5258416dfdda64c9..001a6a1619d18a14e852813169400ecc4a37da1f 100644 (file)
--- a/commands/writeisofs/Makefile
+++ b/commands/writeisofs/Makefile
@@ -1,4 +1,4 @@
 PROG=  writeisofs
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/xargs/Makefile b/commands/xargs/Makefile
index 1d9e690722e7daf99324428d2664aedaa0ded39f..8578e0f74626428a0276a63eaf939da422031e07 100644 (file)
--- a/commands/xargs/Makefile
+++ b/commands/xargs/Makefile
@@ -1,4 +1,4 @@
 PROG=  xargs
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/yacc/Makefile b/commands/yacc/Makefile
index 72617494a8bbaf7baacf3da26e21486a41e45837..417511a7f2099ae7436615415bafff488a861e89 100644 (file)
--- a/commands/yacc/Makefile
+++ b/commands/yacc/Makefile
@@ -4,4 +4,4 @@ PROG=   yacc
 SRCS=  closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
        skeleton.c symtab.c verbose.c warshall.c
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/yap/Makefile b/commands/yap/Makefile
index 20ee5e8d1e1176c92da5372011a1eeb416d6278c..7f807f4a63ef7b4eb1e65a19a969586023da730e 100644 (file)
--- a/commands/yap/Makefile
+++ b/commands/yap/Makefile
@@ -12,4 +12,4 @@ CPPFLAGS+= -wa
 LINKS+=        ${BINDIR}/yap ${BINDIR}/more
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/yes/Makefile b/commands/yes/Makefile
index 2a958fa13f754e8554b3660889b1526ff48bed10..c1c7115c853b890af8ce4a23a9aca0d3456e2da0 100644 (file)
--- a/commands/yes/Makefile
+++ b/commands/yes/Makefile
@@ -1,4 +1,4 @@
 PROG=  yes
 MAN=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/zdump/Makefile b/commands/zdump/Makefile
index 462b7a92b9437fa83584b3bb89502773ffc6b238..831b767e572f4c201defb27c114d51e6662dd31e 100644 (file)
--- a/commands/zdump/Makefile
+++ b/commands/zdump/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  zdump
 SRCS=  zdump.c ialloc.c
@@ -8,4 +8,4 @@ MAN=    zdump.8
 
 .PATH: ${MINIXSRCDIR}/lib/libc/stdtime
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/zic/Makefile b/commands/zic/Makefile
index eb2093847851ffe1bf8213b5a38bb204fc3bf782..6ed47b24c36c0e23a9696cd03e56d6b6871aac56 100644 (file)
--- a/commands/zic/Makefile
+++ b/commands/zic/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  zic
 SRCS=  zic.c scheck.c ialloc.c
@@ -8,4 +8,4 @@ MAN=    zic.8
 
 .PATH: ${MINIXSRCDIR}/lib/libc/stdtime
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/commands/zmodem/Makefile b/commands/zmodem/Makefile
index 92f6f6421a71cf216dd24c5ca1d70d75d9582471..35dd33a6c8fe87a691726ebabad0b9fa23caa9da 100644 (file)
--- a/commands/zmodem/Makefile
+++ b/commands/zmodem/Makefile
@@ -5,4 +5,4 @@ CPPFLAGS+= -DPOSIX
 MAN.rz=
 MAN.sz=
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/Makefile b/drivers/Makefile
index 7b515fe9acee69deef0870987567130ae775a25c..4ad8de2a3816be3cf7b09d387b310dc6bb6eb354 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,7 +1,7 @@
 # Makefile for all device drivers.
 #
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 # memory driver must be last for ramdisk image
 SUBDIR=        amddev atl2 at_wini audio bios_wini dec21140A dp8390 dpeth \
@@ -12,4 +12,4 @@ SUBDIR=       amddev atl2 at_wini audio bios_wini dec21140A dp8390 dpeth \
 # memory driver must be last for ramdisk image
 IMAGE_SUBDIR=  at_wini bios_wini floppy log tty pci .WAIT ramdisk .WAIT memory
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/drivers/amddev/Makefile b/drivers/amddev/Makefile
index bcb972ef7b7d09646aab10ca3130e699c35836d7..43714052823087f810ce99e880c1a968db6501d1 100644 (file)
--- a/drivers/amddev/Makefile
+++ b/drivers/amddev/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/at_wini/Makefile b/drivers/at_wini/Makefile
index e7a0e64b858dcab3dd1ca15288b9c8b038b2bce8..88aa5540d185d79cd90f202dae4d549703954789 100644 (file)
--- a/drivers/at_wini/Makefile
+++ b/drivers/at_wini/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/atl2/Makefile b/drivers/atl2/Makefile
index 48f41908de0ab4a876f4815f75a8b524c008f3c1..46ce34a4085588eb9d403bb1446fa3898deda2d9 100644 (file)
--- a/drivers/atl2/Makefile
+++ b/drivers/atl2/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/audio/Makefile b/drivers/audio/Makefile
index 2b765b0c63dd7238ef75d894c25e618bd2387179..77114cd87408fbc4d2fe233f4fd2ef0f95e50091 100644 (file)
--- a/drivers/audio/Makefile
+++ b/drivers/audio/Makefile
@@ -1,7 +1,7 @@
 # Makefile for all audio drivers.
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR=        common .WAIT es1370 es1371 sb16
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/drivers/audio/Makefile.inc b/drivers/audio/Makefile.inc
index 8e2d82c1b11fe7c514ebc7175a04816a626ebc85..2da84390981af2c6c0f6eb501135e148c38824ba 100644 (file)
--- a/drivers/audio/Makefile.inc
+++ b/drivers/audio/Makefile.inc
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common

diff --git a/drivers/audio/common/Makefile b/drivers/audio/common/Makefile
index 7e3f2e7791bf6db92f75ac9a84e4a33698738d88..cc347102804ea39fa1202ba3b7da2f4967cc3b72 100644 (file)
--- a/drivers/audio/common/Makefile
+++ b/drivers/audio/common/Makefile
@@ -5,4 +5,4 @@ LIBISPRIVATE=   yes
 LIB=    common
 SRCS=   audio_fw.c liveupdate.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/drivers/audio/es1370/Makefile b/drivers/audio/es1370/Makefile
index bf335820f87040c4d59c0b64ebac2e6f5a5b28e7..46136bcdd836cf079f3e9e91ab656ea239c824ac 100644 (file)
--- a/drivers/audio/es1370/Makefile
+++ b/drivers/audio/es1370/Makefile
@@ -8,4 +8,4 @@ LIBS += -ldriver
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/audio/es1371/Makefile b/drivers/audio/es1371/Makefile
index 4e7016127e743fae05a14b23ccc53cbac0c216dd..6f4c6f854597be4a03d449f21c3ad1488f5d94ed 100644 (file)
--- a/drivers/audio/es1371/Makefile
+++ b/drivers/audio/es1371/Makefile
@@ -6,4 +6,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/audio/sb16/Makefile b/drivers/audio/sb16/Makefile
index 415375223441fa4ac1258affc34ee9f5c33ab12d..cbec2d57c01d204e7e904104e6ffd4e9f2b70d5f 100644 (file)
--- a/drivers/audio/sb16/Makefile
+++ b/drivers/audio/sb16/Makefile
@@ -6,4 +6,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/bios_wini/Makefile b/drivers/bios_wini/Makefile
index 2e584ad2e61287ffe1276c1ea90161d7472bd957..35f1b01deb2607d8ce7b8f92a3b614a69f16c45e 100644 (file)
--- a/drivers/bios_wini/Makefile
+++ b/drivers/bios_wini/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/dec21140A/Makefile b/drivers/dec21140A/Makefile
index 75824a41ee45392276eed33c26a91b7bc16439f9..d86b181ab46fcdb5921f56a04d8b2cdc6d646e14 100644 (file)
--- a/drivers/dec21140A/Makefile
+++ b/drivers/dec21140A/Makefile
@@ -14,4 +14,4 @@ BINDIR?= /usr/sbin
 debug=         0
 CPPFLAGS+=     -Ddebug=${debug} -ws -w -Wall
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/dp8390/Makefile b/drivers/dp8390/Makefile
index c2a2c075dbffb37816dc1900055c299ca3295440..2cbd1fedf46ec6451c8f9345bed41e29bcf55138 100644 (file)
--- a/drivers/dp8390/Makefile
+++ b/drivers/dp8390/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/dpeth/Makefile b/drivers/dpeth/Makefile
index e6c07cb4744fa2e10ae19d6b94ecd6ff16f91fa5..b82759d9ea85e99fa02d7b3259c8c4f5ada353ec 100644 (file)
--- a/drivers/dpeth/Makefile
+++ b/drivers/dpeth/Makefile
@@ -14,4 +14,4 @@ BINDIR?= /usr/sbin
 debug=         0
 CPPFLAGS+=     -Ddebug=$(debug)
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/e1000/Makefile b/drivers/e1000/Makefile
index 7298b225fcd950d198d8ab6887597e032220aa83..4a035d10de13d12dcbc79631b6f75efb30981110 100644 (file)
--- a/drivers/e1000/Makefile
+++ b/drivers/e1000/Makefile
@@ -11,4 +11,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/filter/Makefile b/drivers/filter/Makefile
index d419e4721bf9164db682b84f830aa1d12d951d3c..b9313be20b51edb3c128cf4baf2a86c53fbebe8c 100644 (file)
--- a/drivers/filter/Makefile
+++ b/drivers/filter/Makefile
@@ -11,4 +11,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS+= -DDEBUG=1 -DDEBUG2=0
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/floppy/Makefile b/drivers/floppy/Makefile
index 9b9d5d87ae513e2f72651dff796686c48072fbdb..06f2baa2761084638ce901b74323d5dd3c5971ff 100644 (file)
--- a/drivers/floppy/Makefile
+++ b/drivers/floppy/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/fxp/Makefile b/drivers/fxp/Makefile
index d1f5f59caea4ad4cf680b3188cfc2c6d8b8ff10f..c91f1c51b098d6ec6cb98dfb84b3862ceceeef10 100644 (file)
--- a/drivers/fxp/Makefile
+++ b/drivers/fxp/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/hello/Makefile b/drivers/hello/Makefile
index e2fa502abfbb3b019eb95b58eee7b7d195d8553b..52d4764fe308cf042039742bdea09bbcd5c429c9 100644 (file)
--- a/drivers/hello/Makefile
+++ b/drivers/hello/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/lance/Makefile b/drivers/lance/Makefile
index d15557514afed062945980c1f4d2f66992300a65..d09f8726c4c96c22a2f873f705b11a421355a1b9 100644 (file)
--- a/drivers/lance/Makefile
+++ b/drivers/lance/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index f9c8da9f9837d1302ff1c9ad7daa98f204c93e0e..1edda8c3e6223c0d59c451d7fedb15cb07da9367 100644 (file)
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -10,4 +10,4 @@ MAN=
 BINDIR?= /sbin
 INSTALLFLAGS+= -S 32k
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index bf776f900d2b804793948ef532a8f62abfcbacf7..78efeff19f70e782dbf78700b72446a9b1058695 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -1,5 +1,5 @@
 # Makefile for memory driver (MEMORY)
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  memory
 SRCS=  memory.c imgrd.c
@@ -15,4 +15,4 @@ INSTALLFLAGS+=        -S 8k
 CPPFLAGS.memory.c+=    -I${MINIXSRCDIR}
 CPPFLAGS.imgrd.c+=     -I${.CURDIR}/../ramdisk -T /usr/tmp
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/orinoco/Makefile b/drivers/orinoco/Makefile
index 4db8d2dbc68ca1453e8b027d2b39414d9d31ad90..4393ea20d166b888d3baf2e8cce6e33646907a9d 100644 (file)
--- a/drivers/orinoco/Makefile
+++ b/drivers/orinoco/Makefile
@@ -11,4 +11,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS.orinoco.c+=   -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 4e2c5b121eda5e1752911847100bd1747a602782..c2632070ceb3ed584906fe65d66ce82e913a1b61 100644 (file)
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/printer/Makefile b/drivers/printer/Makefile
index 37abf14be374cdb4640f15a100764a7827a4f5c9..7b2c188c4efaf60fac10904bd5f72df3c5c9e996 100644 (file)
--- a/drivers/printer/Makefile
+++ b/drivers/printer/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 1232517a3bcd0bdfe8522942ad95d482c3b5767f..cfbba1d3f42ce91cfd1027e9c190947f0b5c4101 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -106,4 +106,4 @@ passwd: ../../etc/passwd
 proto.gen: $(MAKEDEV) proto.sh proto
        sh -e proto.sh >proto.gen
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index 21fccde02549307fa7b5d3d03d63963c23c39802..7cf406dbfae712e969783f2b9417371782033b4c 100644 (file)
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -13,5 +13,5 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS.random.c+=    -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>
 

diff --git a/drivers/readclock/Makefile b/drivers/readclock/Makefile
index 65f85dd9b6bf32206fcd8a1aba0e17a9392c1c4b..9a8c817f8fb159377d2675f3a4aecc3e17f31af3 100644 (file)
--- a/drivers/readclock/Makefile
+++ b/drivers/readclock/Makefile
@@ -11,4 +11,4 @@ BINDIR?= /sbin
 
 CPPFLAGS+= -D_SYSTEM=1
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile
index a5aeffbf705ba83a1f161120dc9360448bfeafc0..3a5a6a34d3d71eb5ec76ffbcbe1d70533cbb5766 100644 (file)
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@@ -11,4 +11,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS+=     -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/rtl8169/Makefile b/drivers/rtl8169/Makefile
index 04051400ef8b30a5132d9a638d36e70129b11e33..25b01ff2567ad93a759e4568b524fa0a89551113 100644 (file)
--- a/drivers/rtl8169/Makefile
+++ b/drivers/rtl8169/Makefile
@@ -11,4 +11,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS+=     -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/sb16/Makefile b/drivers/sb16/Makefile
index ac1aac5b3e2110eb70bb25780af37416690645ed..1c7aa1d10ed351982d5cdbea17f04680bb8b3594 100644 (file)
--- a/drivers/sb16/Makefile
+++ b/drivers/sb16/Makefile
@@ -1,7 +1,7 @@
 # Makefile for the Sound Blaster 16 (SB16) driver
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR=        common .WAIT dsp mixer
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/drivers/sb16/Makefile.inc b/drivers/sb16/Makefile.inc
index 8e2d82c1b11fe7c514ebc7175a04816a626ebc85..2da84390981af2c6c0f6eb501135e148c38824ba 100644 (file)
--- a/drivers/sb16/Makefile.inc
+++ b/drivers/sb16/Makefile.inc
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common

diff --git a/drivers/sb16/common/Makefile b/drivers/sb16/common/Makefile
index 8af3a809e08e4023a89ecd32b29c7a18c3fb17bb..0dcdab18a719c9a838575624421d0755d26a8b7b 100644 (file)
--- a/drivers/sb16/common/Makefile
+++ b/drivers/sb16/common/Makefile
@@ -5,4 +5,4 @@ LIBISPRIVATE=   yes
 LIB=    common
 SRCS=   sb16.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/drivers/sb16/dsp/Makefile b/drivers/sb16/dsp/Makefile
index 43e75c2ba8d7a4d2820aeebe32d16f3947bf0a68..82393ac9c88a10b3719e56f135b720740735ccd2 100644 (file)
--- a/drivers/sb16/dsp/Makefile
+++ b/drivers/sb16/dsp/Makefile
@@ -6,4 +6,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/sb16/mixer/Makefile b/drivers/sb16/mixer/Makefile
index 28edb53d41e71e6a965082e7dc5f3a6e524a9ace..1da7722a860422c6df1c5cab6da5353476210b5c 100644 (file)
--- a/drivers/sb16/mixer/Makefile
+++ b/drivers/sb16/mixer/Makefile
@@ -6,4 +6,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/ti1225/Makefile b/drivers/ti1225/Makefile
index e95f48afd3c0d62dacf62fd07ce66e12600411f3..55a57a621dd3a84a5bbfca04aea17e43a6d0500a 100644 (file)
--- a/drivers/ti1225/Makefile
+++ b/drivers/ti1225/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 3ca62ae3f6f162f153d1cbd01adfd4156877073a..6e0b86af6b2dd7b1105d7a2ef24625d2174bea3c 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -1,6 +1,6 @@
 # Makefile for terminal driver (TTY)
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  tty
 SRCS=  tty.c console.c keyboard.c pty.c rs232.c
@@ -18,5 +18,5 @@ SUBDIR= keymaps
 # Needs kernel/const.h, etc
 CPPFLAGS+=     -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
-.include <minix.subdir.mk>
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>

diff --git a/drivers/tty/keymaps/Makefile b/drivers/tty/keymaps/Makefile
index 1aec39611a528d1fe53a7e07aceb5f08412eebd9..02e80164695734d5fc3976331bd0e2d4a9f058a3 100644 (file)
--- a/drivers/tty/keymaps/Makefile
+++ b/drivers/tty/keymaps/Makefile
@@ -1,6 +1,6 @@
 # Generate binary keymaps.
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 FILES= dvorak.map french.map german.map italian.map japanese.map \
        latin-america.map olivetti.map polish.map russian-cp866.map \
@@ -10,4 +10,4 @@ FILES=        dvorak.map french.map german.map italian.map japanese.map \
 
 .include "Makefile.inc"
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/etc/mk/minix.ack.mk b/etc/mk/bsd.ack.mk
similarity index 100%
rename from etc/mk/minix.ack.mk
rename to etc/mk/bsd.ack.mk

diff --git a/etc/mk/minix.dep.mk b/etc/mk/bsd.dep.mk
similarity index 100%
rename from etc/mk/minix.dep.mk
rename to etc/mk/bsd.dep.mk

diff --git a/etc/mk/minix.files.mk b/etc/mk/bsd.files.mk
similarity index 98%
rename from etc/mk/minix.files.mk
rename to etc/mk/bsd.files.mk
index f853b610d338873a288f44768fff08038e457c2b..c44c5d0a9eab46c462c54fb913df644e3a082440 100644 (file)
--- a/etc/mk/minix.files.mk
+++ b/etc/mk/bsd.files.mk
@@ -3,7 +3,7 @@
 .if !defined(_MINIX_FILES_MK_)
 _MINIX_FILES_MK_=1
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 .if !target(__fileinstall)
 ##### Basic targets
@@ -155,7 +155,7 @@ cleanuudecodefiles: .PHONY
 .endif                                                         # }
 
 ##### Pull in related .mk logic
-.include <minix.obj.mk>
-#.include <minix.sys.mk>
+.include <bsd.obj.mk>
+#.include <bsd.sys.mk>
 
 .endif # !defined(_MINIX_FILES_MK_)

diff --git a/etc/mk/minix.gcc.mk b/etc/mk/bsd.gcc.mk
similarity index 100%
rename from etc/mk/minix.gcc.mk
rename to etc/mk/bsd.gcc.mk

diff --git a/etc/mk/minix.inc.mk b/etc/mk/bsd.inc.mk
similarity index 98%
rename from etc/mk/minix.inc.mk
rename to etc/mk/bsd.inc.mk
index 817102311e5223dbb2b9010a140c5d79bcd8808e..58acf111c4d24d9f3d901b0fa3e2dbbd64f7a120 100644 (file)
--- a/etc/mk/minix.inc.mk
+++ b/etc/mk/bsd.inc.mk
@@ -1,6 +1,6 @@
 #      $NetBSD: bsd.inc.mk,v 1.32 2006/03/16 18:43:34 jwise Exp $
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 ##### Basic targets
 includes:      ${INCS} incinstall inclinkinstall

diff --git a/etc/mk/minix.init.mk b/etc/mk/bsd.init.mk
similarity index 53%
rename from etc/mk/minix.init.mk
rename to etc/mk/bsd.init.mk
index 258388b6090aaf4491fd106c7892d08cd9eea430..23e1b032de9725b58851a0e5a7889a4660db7242 100644 (file)
--- a/etc/mk/minix.init.mk
+++ b/etc/mk/bsd.init.mk
@@ -1,13 +1,13 @@
 #      $NetBSD: bsd.init.mk,v 1.2 2003/07/28 02:38:33 lukem Exp $
 
-# <minix.init.mk> includes Makefile.inc and <minix.own.mk>; this is used at the
-# top of all <minix.*.mk> files which actually "build something".
+# <bsd.init.mk> includes Makefile.inc and <bsd.own.mk>; this is used at the
+# top of all <bsd.*.mk> files which actually "build something".
 
 .if !defined(_MINIX_INIT_MK_)
 _MINIX_INIT_MK_=1
 
 .-include "${.CURDIR}/../Makefile.inc"
-.include <minix.own.mk>
+.include <bsd.own.mk>
 .MAIN:         all
 
 .endif # !defined(_MINIX_INIT_MK_)

diff --git a/etc/mk/minix.kinc.mk b/etc/mk/bsd.kinc.mk
similarity index 96%
rename from etc/mk/minix.kinc.mk
rename to etc/mk/bsd.kinc.mk
index 08224df38c5f1c736b80d2e17295a0a27a8ffb17..e69d316769fea8f9ecf651f748e8969db3de874c 100644 (file)
--- a/etc/mk/minix.kinc.mk
+++ b/etc/mk/bsd.kinc.mk
@@ -17,7 +17,7 @@
 #              directories.
 #
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 ##### Basic targets
 .PRECIOUS:     ${DESTDIR}${INCSDIR}
@@ -89,5 +89,5 @@ incinstall::
 .endif
 
 ##### Pull in related .mk logic
-.include <minix.subdir.mk>
-.include <minix.sys.mk>
+.include <bsd.subdir.mk>
+.include <bsd.sys.mk>

diff --git a/etc/mk/minix.klinks.mk b/etc/mk/bsd.klinks.mk
similarity index 98%
rename from etc/mk/minix.klinks.mk
rename to etc/mk/bsd.klinks.mk
index 2e3c5e7c09d7f4e2c47a57c96ea249b4c1d443fc..b35c2de65e7545ead2daaf0e9fe9fb503deeb659 100644 (file)
--- a/etc/mk/minix.klinks.mk
+++ b/etc/mk/bsd.klinks.mk
@@ -1,7 +1,7 @@
 #      $NetBSD: bsd.klinks.mk,v 1.6 2009/11/27 13:50:29 pooka Exp $
 #
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 ##### Default values
 .if !defined(S)

diff --git a/etc/mk/minix.lib.mk b/etc/mk/bsd.lib.mk
similarity index 93%
rename from etc/mk/minix.lib.mk
rename to etc/mk/bsd.lib.mk
index e24031ddceed86d49eab674ff44fba9ab073861b..c9c26a9407df7df63ecb7b47c7fdab4d4e7a4f59 100644 (file)
--- a/etc/mk/minix.lib.mk
+++ b/etc/mk/bsd.lib.mk
@@ -1,10 +1,10 @@
 #      $NetBSD: bsd.lib.mk,v 1.299 2009/11/27 11:44:36 tsutsui Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
-# Pull in <minix.sys.mk> here so we can override its .c.o rule
-.include <minix.sys.mk>
+# Pull in <bsd.sys.mk> here so we can override its .c.o rule
+.include <bsd.sys.mk>
 
 LIBISPRIVATE?= no
 
@@ -150,13 +150,13 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall
 LINKSOWN?= ${LIBOWN}
 LINKSGRP?= ${LIBGRP}
 LINKSMODE?= ${LIBMODE}
-.include <minix.files.mk>
-.include <minix.inc.mk>
-.include <minix.links.mk>
-.include <minix.dep.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
+.include <bsd.links.mk>
+.include <bsd.dep.mk>
 
 .if ${COMPILER_TYPE} == "ack"
-.include <minix.ack.mk>
+.include <bsd.ack.mk>
 .elif ${COMPILER_TYPE} == "gnu"
-.include <minix.gcc.mk>
+.include <bsd.gcc.mk>
 .endif

diff --git a/etc/mk/minix.links.mk b/etc/mk/bsd.links.mk
similarity index 97%
rename from etc/mk/minix.links.mk
rename to etc/mk/bsd.links.mk
index 4ff1c936fa9935b27df16de5119b460114668f68..067236d65bccc31b69e35eb897c3f5ea553524f4 100644 (file)
--- a/etc/mk/minix.links.mk
+++ b/etc/mk/bsd.links.mk
@@ -1,6 +1,6 @@
 #      $NetBSD: bsd.links.mk,v 1.34 2009/04/10 16:16:12 apb Exp $
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 ##### Basic targets
 install:       linksinstall
@@ -93,4 +93,4 @@ configlinksinstall::  ${_t}
 .PRECIOUS:     ${_t}
 .endfor
 
-.include <minix.sys.mk>
+.include <bsd.sys.mk>

diff --git a/etc/mk/minix.man.mk b/etc/mk/bsd.man.mk
similarity index 98%
rename from etc/mk/minix.man.mk
rename to etc/mk/bsd.man.mk
index df015fff1282ea20a15679dfee6faa2a5ca319d9..402ce17bf52b40c9d20dffbaa3c2963f1b9ad0b1 100644 (file)
--- a/etc/mk/minix.man.mk
+++ b/etc/mk/bsd.man.mk
@@ -1,7 +1,7 @@
 #      $NetBSD: bsd.man.mk,v 1.102 2009/10/23 23:12:10 joerg Exp $
 #      @(#)bsd.man.mk  8.1 (Berkeley) 6/8/93
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 ##### Basic targets
 .PHONY:                maninstall manpages manlinks
@@ -281,8 +281,8 @@ cleanman: .PHONY
 # .endif
 
 ##### Pull in related .mk logic
-.include <minix.obj.mk>
-.include <minix.files.mk>
-.include <minix.sys.mk>
+.include <bsd.obj.mk>
+.include <bsd.files.mk>
+.include <bsd.sys.mk>
 
 ${TARGETS} catinstall maninstall htmlinstall: # ensure existence

diff --git a/etc/mk/minix.obj.mk b/etc/mk/bsd.obj.mk
similarity index 98%
rename from etc/mk/minix.obj.mk
rename to etc/mk/bsd.obj.mk
index 396906d57c40d5706ecbce8dc73b92cdddb1a7af..2bc5d5a10945497c1366068111965755b54e1f4d 100644 (file)
--- a/etc/mk/minix.obj.mk
+++ b/etc/mk/bsd.obj.mk
@@ -3,7 +3,7 @@
 .if !defined(_MINIX_OBJ_MK_)
 _MINIX_OBJ_MK_=1
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 __curdir:=     ${.CURDIR}
 
@@ -104,6 +104,6 @@ obj:
 print-objdir:
        @echo ${.OBJDIR}
 
-.include <minix.sys.mk>
+.include <bsd.sys.mk>
 
 .endif # !defined(_MINIX_OBJ_MK_)

diff --git a/etc/mk/minix.own.mk b/etc/mk/bsd.own.mk
similarity index 100%
rename from etc/mk/minix.own.mk
rename to etc/mk/bsd.own.mk

diff --git a/etc/mk/minix.prog.mk b/etc/mk/bsd.prog.mk
similarity index 97%
rename from etc/mk/minix.prog.mk
rename to etc/mk/bsd.prog.mk
index eaef1f23c0d6dc17e9dfd361b6774a60e7bd9f49..4071791932cfadda10f0ff096f3179d45ef0864f 100644 (file)
--- a/etc/mk/minix.prog.mk
+++ b/etc/mk/bsd.prog.mk
@@ -3,7 +3,7 @@
 
 .ifndef HOSTPROG
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 #
 # Definitions and targets shared among all programs built by a single
@@ -352,17 +352,17 @@ scriptsinstall::
 LINKSOWN?= ${BINOWN}
 LINKSGRP?= ${BINGRP}
 LINKSMODE?= ${BINMODE}
-.include <minix.man.mk>
-.include <minix.files.mk>
-.include <minix.inc.mk>
-.include <minix.links.mk>
-.include <minix.sys.mk>
-.include <minix.dep.mk>
+.include <bsd.man.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
+.include <bsd.links.mk>
+.include <bsd.sys.mk>
+.include <bsd.dep.mk>
 
 .if ${COMPILER_TYPE} == "ack"
-.include <minix.ack.mk>
+.include <bsd.ack.mk>
 .elif ${COMPILER_TYPE} == "gnu"
-.include <minix.gcc.mk>
+.include <bsd.gcc.mk>
 .endif
 
 

diff --git a/etc/mk/minix.subdir.mk b/etc/mk/bsd.subdir.mk
similarity index 97%
rename from etc/mk/minix.subdir.mk
rename to etc/mk/bsd.subdir.mk
index a4957b9f1b78bfbb96794c5c1fd9556eae3ff7cb..56311af728273617d6af3435b7d52ca503f38e83 100644 (file)
--- a/etc/mk/minix.subdir.mk
+++ b/etc/mk/bsd.subdir.mk
@@ -1,7 +1,7 @@
 #      $NetBSD: bsd.subdir.mk,v 1.50 2009/11/29 16:00:00 uebayasi Exp $
 #      @(#)bsd.subdir.mk       8.1 (Berkeley) 6/8/93
 
-.include <minix.init.mk>
+.include <bsd.init.mk>
 
 # MINIX: cleandepend works for SUBDIRs
 TARGETS+= cleandepend

diff --git a/etc/mk/minix.sys.mk b/etc/mk/bsd.sys.mk
similarity index 100%
rename from etc/mk/minix.sys.mk
rename to etc/mk/bsd.sys.mk

diff --git a/include/Makefile b/include/Makefile
index 782ded77e3e724be78a98c36e3d05e8a12f488c5..5bbf3402021661245453fe44742aaa1ca5d27dfd 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -39,11 +39,11 @@ INCS+=      net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
        net/gen/vjhc.h
 INCS+= netinet/if_ether.h netinet/in.h netinet/tcp.h
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 INCSDIR=        /usr/include
 
 SUBDIR=                sys arch
 
-.include <minix.prog.mk>
-.include <minix.subdir.mk>
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>

diff --git a/include/arch/Makefile b/include/arch/Makefile
index 0dd0ef5b7fb5fd47f0c491b547581f9a79fbc3cd..9668ddb76545e93f3665cbc30ccc7122c22aee20 100644 (file)
--- a/include/arch/Makefile
+++ b/include/arch/Makefile
@@ -1,7 +1,7 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR= ${ARCH}
 
 INCSYMLINKS= ${MACHINE} /usr/include/machine
 
-.include <minix.kinc.mk>
+.include <bsd.kinc.mk>

diff --git a/include/arch/i386/Makefile b/include/arch/i386/Makefile
index dacd0bfaa4989013a6dd9062106bfb9554a08b6d..e6a3ef52d200ce7593012f204d5d239ed44698ad 100644 (file)
--- a/include/arch/i386/Makefile
+++ b/include/arch/i386/Makefile
@@ -4,4 +4,4 @@ INCS=   archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
        interrupt.h mcontext.h memory.h partition.h pci.h ports.h \
        stackframe.h vm.h
 
-.include <minix.kinc.mk>
+.include <bsd.kinc.mk>

diff --git a/include/sys/Makefile b/include/sys/Makefile
index d06942eaa1a49fa5f80ed811681e98d8ee1dee86..6cc8f8bb267827f88efb1f98c672fbc39247cd20 100644 (file)
--- a/include/sys/Makefile
+++ b/include/sys/Makefile
@@ -1,4 +1,4 @@
-.include <minix.sys.mk>
+.include <bsd.sys.mk>
 
 INCSDIR=        /usr/include/sys
 
@@ -11,4 +11,4 @@ INCS= asynchio.h dir.h file.h ioc_cmos.h ioc_disk.h \
        time.h times.h types.h ucontext.h uio.h un.h utsname.h video.h vm.h \
        wait.h cdefs.h 
 
-.include <minix.kinc.mk>
+.include <bsd.kinc.mk>

diff --git a/kernel/Makefile b/kernel/Makefile
index d2e2e0d58bb3a7e3e3339073cee8b93428a7258f..61a87376ce9402e7664a34023518c827825c924b 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kernel
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  kernel
 
@@ -31,7 +31,7 @@ MAN=
 
 .include "system/Makefile.inc"
 .include "arch/${ARCH}/Makefile.inc"
-.include <minix.prog.mk>
+.include <bsd.prog.mk>
 
 debug.d: extracted-errno.h extracted-mfield.h extracted-mtype.h
 

diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index e40cde29f82a243dad0475d4e06e9b1de2f9979d..620c3e879f997b77f5c2ba853f198b02216a2a46 100644 (file)
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -1,5 +1,5 @@
 # Makefile for arch-dependent kernel code
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/arch/${ARCH}
 SRCS+= arch_do_vmctl.c \

diff --git a/kernel/system/Makefile.inc b/kernel/system/Makefile.inc
index 8c1cb6887936a0257bd950bde2a3d63d1114b319..202bfab0799da05de3d1ad6f73bf36631046982d 100644 (file)
--- a/kernel/system/Makefile.inc
+++ b/kernel/system/Makefile.inc
@@ -1,5 +1,5 @@
 # Makefile for system library implementation
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/system
 SRCS+=         \

diff --git a/lib/Makefile b/lib/Makefile
index c45fccf70d39a351b4d89df60a5fb2fd3a376790..5f7ad6681a3d9bb773576f35ba6cfaf9049afadd 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR= csu libc libcurses libdriver libnetdriver libend libedit libm libsys \
        libtimers libutil libbz2 libl libhgfs libz
@@ -7,7 +7,7 @@ SUBDIR= csu libc libcurses libdriver libnetdriver libend libedit libm libsys \
 SUBDIR+= ack/libd ack/libe ack/libfp ack/liby
 .endif
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>
 
 build_ack:
        sh ack_build.sh obj depend all install

diff --git a/lib/ack/libd/Makefile b/lib/ack/libd/Makefile
index 5777203cd6020b3934ca5025b08f90489b491077..fda5d3d1e73cc1fc234bb96ef3ed8bd96bc176a1 100644 (file)
--- a/lib/ack/libd/Makefile
+++ b/lib/ack/libd/Makefile
@@ -14,4 +14,4 @@ LIB=  d
 
 SRCS=  fphook.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/ack/libe/Makefile b/lib/ack/libe/Makefile
index a79e19ad3619380dd5fdb1c54f1535a5a3743700..c849efdc7dc00114bc2dbf638e3ffe3078784820 100644 (file)
--- a/lib/ack/libe/Makefile
+++ b/lib/ack/libe/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libe
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 LIB=           e
 
@@ -9,4 +9,4 @@ AFLAGS+=-Was-ack
 .include "${.CURDIR}/arch/${ARCH}/em/Makefile.inc"
 .include "${.CURDIR}/arch/${ARCH}/head/Makefile.inc"
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/ack/libe/Makefile.inc b/lib/ack/libe/Makefile.inc
index 7729eaacb60bd1c1810f6d85a5d5e2e48472461a..4df075ad98ea041879f4538dd5825cafdfde0810 100644 (file)
--- a/lib/ack/libe/Makefile.inc
+++ b/lib/ack/libe/Makefile.inc
@@ -1 +1 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>

diff --git a/lib/ack/libfp/Makefile b/lib/ack/libfp/Makefile
index d55950c8e61384672a9739de629ef2c09293d255..3808f4eeac40b37f187d52f8a1448beb84e302b0 100644 (file)
--- a/lib/ack/libfp/Makefile
+++ b/lib/ack/libfp/Makefile
@@ -53,4 +53,4 @@ SRCS=  \
        zrf8.fc \
        zrf_ext.fc
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/ack/liby/Makefile b/lib/ack/liby/Makefile
index 50503383ee65d929e88b41fa1ebc37ca162d3f91..2f42f61c593b01dc25f569d6eb973cf7037c928c 100644 (file)
--- a/lib/ack/liby/Makefile
+++ b/lib/ack/liby/Makefile
@@ -6,4 +6,4 @@ SRCS=   \
        main.c \
        yyerror.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index b6abdb2237f9512d941d0c9cdd700ded974b2529..78c737fb37530564b26283564ba84e4b92d4b470 100644 (file)
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/${ARCH}
 
@@ -11,4 +11,4 @@ FILES=${OBJS}
 FILESDIR=${LIBDIR}
 CLEANFILES=${OBJS}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 5673753e17fbd4ec503e4234df050d7f58b60ffa..183e9821d494c847e1eb569f974d05bc06a37514 100644 (file)
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 LIB=           bz2
 BZ2DIR=                ${MINIXSRCDIR}/commands/bzip2
@@ -10,4 +10,4 @@ CPPFLAGS+=    -I ${BZ2DIR}
 INCS=          bzlib.h
 INCSDIR=       /usr/include
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 5590fbc1f3710ca0ab5fe80968f2e527d1fd2fe0..b83662ddac126bd6f415c49bb0b047e151956b41 100644 (file)
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -32,4 +32,4 @@ LIB=          c
 .include "${.CURDIR}/gnu/arch/${ARCH}/rts/Makefile.inc"
 .endif
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index 7729eaacb60bd1c1810f6d85a5d5e2e48472461a..4df075ad98ea041879f4538dd5825cafdfde0810 100644 (file)
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1 +1 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 0bd8367a2f1d714000c0b1d229ff4f51533cb440..f2f945b3d58baa91192a852ecd5601b2bc55ba3c 100644 (file)
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -42,4 +42,4 @@ SRCS=  \
        winsertln.c \
        wintouch.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libdriver/Makefile b/lib/libdriver/Makefile
index 86c269bca9b1de50da5d2ad96fb67b7f3fb83157..3f2a1c7cbbf64592864efc2c626a2b5756614967 100644 (file)
--- a/lib/libdriver/Makefile
+++ b/lib/libdriver/Makefile
@@ -4,4 +4,4 @@ LIB=    driver
 
 SRCS=  driver.c drvlib.c mq.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index d069392b69f3a1be8665fa718d93392b3ef948d0..b3bef76cf89fa2e3bfdffaab5b7716b8a4d8dc09 100644 (file)
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -24,4 +24,4 @@ CPPFLAGS+=-DANSI_ARROWS -DHAVE_STDLIB -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT \
 
 SRCS=  editline.c complete.c sysunix.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libend/Makefile b/lib/libend/Makefile
index 632d3a4ae7921353ad03dc7b657432377d96d6ab..35d9bc999df4c1da1a40c2270e5759f885de16f2 100644 (file)
--- a/lib/libend/Makefile
+++ b/lib/libend/Makefile
@@ -14,4 +14,4 @@ SRCS= \
 .include "${.CURDIR}/gnu/Makefile.inc"
 .endif
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libend/Makefile.inc b/lib/libend/Makefile.inc
index 7729eaacb60bd1c1810f6d85a5d5e2e48472461a..4df075ad98ea041879f4538dd5825cafdfde0810 100644 (file)
--- a/lib/libend/Makefile.inc
+++ b/lib/libend/Makefile.inc
@@ -1 +1 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>

diff --git a/lib/libhgfs/Makefile b/lib/libhgfs/Makefile
index 07c52d7a4e11618ae9f23d31d0051403b16c244e..da2ded5d35ee0b13ffd63f9b390b560b984f5611 100644 (file)
--- a/lib/libhgfs/Makefile
+++ b/lib/libhgfs/Makefile
@@ -4,4 +4,4 @@ LIB=    hgfs
 SRCS=  backdoor.S attr.c channel.c dir.c error.c file.c \
        link.c misc.c path.c rpc.c time.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libl/Makefile b/lib/libl/Makefile
index 432850f0ed8cd9d8c94f9295ae39b9dffff78446..e7f52363f61131b791e8b933643269eb43040a4d 100644 (file)
--- a/lib/libl/Makefile
+++ b/lib/libl/Makefile
@@ -1,6 +1,6 @@
 #      $NetBSD: Makefile,v 1.13 2006/09/11 22:24:09 dbj Exp $
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 LIB=           l
 SRCS=          libmain.c libyywrap.c
@@ -9,4 +9,4 @@ LINKS=          ${LIBDIR}/libl.a ${LIBDIR}/libfl.a
 
 .PATH:         ${MINIXSRCDIR}/commands/lex
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index 84c94a3671433ffb32352513d7277f405ccbe514..4becb6e287b59418c3f0501e44814b019f8aaa5a 100644 (file)
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -6,4 +6,4 @@ LIB=    m
 
 SRCS=  dummy.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libnetdriver/Makefile b/lib/libnetdriver/Makefile
index a1dbf4518fab6c9e7a933ba9acb2f4b5636e84cc..a8e5d7ecd63b7994088230a86a80f44d6d4220db 100644 (file)
--- a/lib/libnetdriver/Makefile
+++ b/lib/libnetdriver/Makefile
@@ -4,4 +4,4 @@ LIB=    netdriver
 
 SRCS=  netdriver.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index 11207c132c58a6d8453218134ea0f09ba41ee62c..c228fcf77320225df88dab805e2da006c7825f2d 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -119,4 +119,4 @@ SRCS=  \
        profile.c \
        vprintf.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libtimers/Makefile b/lib/libtimers/Makefile
index 5fee62830910231845602785c119ce242ff50531..f023ec9ab812af807b20da23585762997db04db6 100644 (file)
--- a/lib/libtimers/Makefile
+++ b/lib/libtimers/Makefile
@@ -7,4 +7,4 @@ SRCS=   \
        tmrs_clr.c \
        tmrs_exp.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 49d77f3bc0ee0e83069496eaad9a47ced3d365ca..16de226cd1f258cec1ec2192db8cf3fb2c1ae02c 100644 (file)
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -4,4 +4,4 @@ LIB=    util
 
 SRCS=  openpty.c sha2.c efun.c
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 932a16e10b5be639854aa6f72bc123b57f196584..0815ea22eaa76232af19c86e4583c29ab00fba84 100644 (file)
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -10,4 +10,4 @@ INCS=           zconf.h zlib.h
 
 CPPFLAGS += -DNO_VIZ=1
 
-.include <minix.lib.mk>
+.include <bsd.lib.mk>

diff --git a/man/Makefile b/man/Makefile
index 6b42eefefe2ace651f3f268224f5e37895294aeb..bfe5d77fa63e36d998828b1931cd14ff14d4901b 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR=        man1 man1x man2 man3 man4 man5 man6 man7 man8 man9
 
@@ -15,5 +15,5 @@ makedb:
 # makedb:
 # .endif
 
-.include <minix.subdir.mk>
-.include <minix.sys.mk>
+.include <bsd.subdir.mk>
+.include <bsd.sys.mk>

diff --git a/man/man1/Makefile b/man/man1/Makefile
index 5fcf1dfaaa9baaec2360093a63061214dbb65fd6..736c8be341836c656518878c20643f0950172a55 100644 (file)
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -25,5 +25,5 @@ MAN=  acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
        urlget.1 uud.1 uue.1 vol.1 wc.1 whatis.1 whereis.1 which.1 \
        who.1 whoami.1 write.1 xargs.1 yap.1 yes.1
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man1x/Makefile b/man/man1x/Makefile
index 534bdfc4b4ec7057da8e31d66c2ecea9e06141b5..9091be625a6d8d573c076a1bd3d73ad68bc49c14 100644 (file)
--- a/man/man1x/Makefile
+++ b/man/man1x/Makefile
@@ -1,5 +1,5 @@
 MAN=   as.1x awk.1x de.1x dis88.1x elle.1x elvis.1x kermit.1x \
        m4.1x macros.1x mined.1x
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man2/Makefile b/man/man2/Makefile
index fccaacbc84eb4c38f4c012b5337d19354a111e05..47eec1ff62adf5f3802c2203be1bb10c993dde0f 100644 (file)
--- a/man/man2/Makefile
+++ b/man/man2/Makefile
@@ -9,5 +9,5 @@ MAN=    access.2 alarm.2 brk.2 chdir.2 chmod.2 chown.2 chroot.2 \
        times.2 truncate.2 umask.2 uname.2 unlink.2 utime.2 \
        wait.2 write.2
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man3/Makefile b/man/man3/Makefile
index db92e70577d156a689de46d8d0909702158fc972..2c9ac6b7b9f00e66316fcaf0b0446bc6db48e25f 100644 (file)
--- a/man/man3/Makefile
+++ b/man/man3/Makefile
@@ -14,5 +14,5 @@ MAN=  abort.3 abs.3 assert.3 atof.3 bstring.3 configfile.3 \
        stdio.3 string.3 strtol.3 syslog.3 system.3 termcap.3 \
        termios.3 time2posix.3 ttyname.3 ttyslot.3 ungetc.3
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man4/Makefile b/man/man4/Makefile
index 5bf17b5502dbf93c231e7e0ddf3b349e68fb5f16..7f7588d9f9e0827ab01894c4787ed46676520d60 100644 (file)
--- a/man/man4/Makefile
+++ b/man/man4/Makefile
@@ -1,4 +1,4 @@
 MAN=   console.4 controller.4 dev.4 fd.4 ip.4 lp.4 mtio.4 tty.4
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man5/Makefile b/man/man5/Makefile
index 099ca21f26e6fdc174c0356be546c2dc6dd7cac7..87985b0c49dd4aacbb62312559bb79d7ba85c6be 100644 (file)
--- a/man/man5/Makefile
+++ b/man/man5/Makefile
@@ -4,5 +4,5 @@ MAN=    configfile.5 crontab.5 dhcp.conf.5 dir.5 ethers.5 \
        syslog.conf.5 termcap.5 ttytab.5 TZ.5 tzfile.5 utmp.5 \
        whatis.5
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man6/Makefile b/man/man6/Makefile
index e79941a9662b3addcc4eaa4e5853a8dbe7fecd2d..3902935e88d0c7523fcc2255e10fc36354b64356 100644 (file)
--- a/man/man6/Makefile
+++ b/man/man6/Makefile
@@ -1,4 +1,4 @@
 MAN=   advent.6 ttt.6
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man7/Makefile b/man/man7/Makefile
index 01aeae7e75b30362bc05240a1e305b3d0073614f..8c5e3ddee4dcf73cf2c180cf697a9f62c6465f5b 100644 (file)
--- a/man/man7/Makefile
+++ b/man/man7/Makefile
@@ -6,5 +6,5 @@ MAN=    ACK.7 ascii.7 environ.7 hier.7 man.7 oss_atiaudio.7 \
        oss_sbpci.7 oss_sbxfi.7 oss_solo.7 oss_trident.7 \
        oss_via823x.7 oss_via97.7 oss_ymf7xx.7 re_format.7
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man8/Makefile b/man/man8/Makefile
index 0664ab8553b956b60005222b0e119a10e07711c1..a7e955753d3feb1c2e153679227515b9a0307784 100644 (file)
--- a/man/man8/Makefile
+++ b/man/man8/Makefile
@@ -11,5 +11,5 @@ MAN=  add_route.8 adduser.8 backup.8 badblocks.8 boot.8 \
        setup.8 shutdown.8 slip.8 srccrc.8 sync.8 syslogd.8 tcpd.8 \
        update.8 usage.8 vmixctl.8
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/man/man9/Makefile b/man/man9/Makefile
index b4cfdf09ee1f3f12e8f5138dc373f4bab686f365..da000493c420819e2c6492f3ed77473804133121 100644 (file)
--- a/man/man9/Makefile
+++ b/man/man9/Makefile
@@ -1,4 +1,4 @@
 MAN=   macros.9
 
-.include <minix.man.mk>
-.include <minix.subdir.mk>
+.include <bsd.man.mk>
+.include <bsd.subdir.mk>

diff --git a/servers/Makefile b/servers/Makefile
index 3efb92e36cacad93a137f6b0978c1d7bfdc90c97..4152e2a1f1e48c26cc7ee37741ed2bdd6e7f120f 100644 (file)
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -1,10 +1,10 @@
 # Makefile for all system servers.
 #
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR=        ds hgfs inet init ipc is iso9660fs mfs pfs pm rs sched vfs vm
 
 IMAGE_SUBDIR=  ds init mfs pfs pm rs sched vfs vm
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/servers/ds/Makefile b/servers/ds/Makefile
index aa8b54dbceb24f2c5f7b3cefc59d9ee70dfa217c..fde1c87cbda4d9bb0f34118cc043f151807aa4a9 100644 (file)
--- a/servers/ds/Makefile
+++ b/servers/ds/Makefile
@@ -10,4 +10,4 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+= -S 16k
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/hgfs/Makefile b/servers/hgfs/Makefile
index f8c75f6e2796d9f6580b03ac4ed017038359e436..11036e7f8c7054a4d3057c5b17e201f94b0f627a 100644 (file)
--- a/servers/hgfs/Makefile
+++ b/servers/hgfs/Makefile
@@ -11,4 +11,4 @@ MAN=
 
 BINDIR?= /sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index 3481cecd1958b5db72196be3a8cfb4876bd537f1..974c024f3452638f9babc1f0f3ab3530092125c9 100644 (file)
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -21,4 +21,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS+=  -I${.CURDIR} -D_MINIX
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/init/Makefile b/servers/init/Makefile
index 7f4a4dd7880f06fbdc87140f2be204a783c25cae..823b16fc6d5a2ce4dd6033ec29ad1445c01a9179 100644 (file)
--- a/servers/init/Makefile
+++ b/servers/init/Makefile
@@ -10,4 +10,4 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+= -S 64k
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/ipc/Makefile b/servers/ipc/Makefile
index e98a9fbbd21fb42e9045d01b205b7cb7f35ee084..5d470e8975b6cca019a3f068a872d0dca577cae8 100644 (file)
--- a/servers/ipc/Makefile
+++ b/servers/ipc/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/is/Makefile b/servers/is/Makefile
index ee9a1ed89438ae81c1a30fecffba3dd891c07ab6..c7fffb4d35e18bb3e3e0cdacf9dc1702bea6ab73 100644 (file)
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@@ -13,4 +13,4 @@ CPPFLAGS.dmp_kernel.c+=       -I${MINIXSRCDIR}
 CPPFLAGS.dmp_rs.c+=    -I${MINIXSRCDIR}
 CPPFLAGS.dmp_vm.c+=    -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/iso9660fs/Makefile b/servers/iso9660fs/Makefile
index c776b66751556924350ee4737d3f63fb0e7ca073..9be9225ea1a29e9b3677338fc897d887552c5e77 100644 (file)
--- a/servers/iso9660fs/Makefile
+++ b/servers/iso9660fs/Makefile
@@ -13,4 +13,4 @@ BINDIR?= /sbin
 NR_BUFS= 100
 CPPFLAGS+= -DNR_BUFS=${NR_BUFS}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/mfs/Makefile b/servers/mfs/Makefile
index 1addd202bb3a70ac86f1b59c8667e07d2618a004..37846138ff9166c3ab9ffcf1294b8307e081a48c 100644 (file)
--- a/servers/mfs/Makefile
+++ b/servers/mfs/Makefile
@@ -16,4 +16,4 @@ INSTALLFLAGS+=        -S 128k
 DEFAULT_NR_BUFS= 1024
 CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/pfs/Makefile b/servers/pfs/Makefile
index a5129e310bb1a5e2cf8e881491cd06a24ab593f0..9e84d39290940e5560786d94b14e0cb362a4ee43 100644 (file)
--- a/servers/pfs/Makefile
+++ b/servers/pfs/Makefile
@@ -11,4 +11,4 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+= -S 128k
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index 8f1eb5970cbdeaf0e36b53ee90807ba15f21e395..ef0f950ac031c32c042b2c5f900a4ad257526427 100644 (file)
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -17,4 +17,4 @@ CPPFLAGS.misc.c+=     -I${MINIXSRCDIR}
 CPPFLAGS.schedule.c+=  -I${MINIXSRCDIR}
 CPPFLAGS.utility.c+=   -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index c3ab6037224ba2a0f67038c09301f730e9a7591b..c8b951a95bf2dca9fb35c0d04827867f99efb8b7 100644 (file)
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -1,5 +1,5 @@
 # Makefile for Reincarnation Server (RS)
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  rs
 SRCS=  exec.c main.c request.c manager.c table.c utility.c memory.c error.c
@@ -14,4 +14,4 @@ INSTALLFLAGS+=        -S 1225k
 
 CPPFLAGS+=     -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/sched/Makefile b/servers/sched/Makefile
index a749527a4829925ce9c295010457fa15dac642a2..777216c35b37296684ce584dba7794029af368f2 100644 (file)
--- a/servers/sched/Makefile
+++ b/servers/sched/Makefile
@@ -14,4 +14,4 @@ CPPFLAGS.main.c+=     -I${MINIXSRCDIR}
 CPPFLAGS.schedule.c+=  -I${MINIXSRCDIR}
 CPPFLAGS.utility.c+=   -I${MINIXSRCDIR}
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/vfs/Makefile b/servers/vfs/Makefile
index 490d9dfc7f4fc6110c742c0437ee25021c75a606..3c0ed1375cfe26634e3285484c0cb64e75ae477a 100644 (file)
--- a/servers/vfs/Makefile
+++ b/servers/vfs/Makefile
@@ -14,4 +14,4 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+= -S 16k
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index b493d0682e6e39c593516d741b09f0caaa9b0392..258c76d62ebf2efaf696e89ca70518a27db23fae 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -1,5 +1,5 @@
 # Makefile for VM server
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 PROG=  vm
 SRCS=  main.c alloc.c utility.c exec.c exit.c fork.c break.c \
@@ -19,4 +19,4 @@ CPPFLAGS+= -I${.CURDIR} -Iarch/${ARCH}
 CPPFLAGS+=     -I${MINIXSRCDIR}
 
 .include "arch/${ARCH}/Makefile.inc"
-.include <minix.prog.mk>
+.include <bsd.prog.mk>

diff --git a/servers/vm/arch/i386/Makefile.inc b/servers/vm/arch/i386/Makefile.inc
index 81a711994b14e1d8824d3d68556473c7e47df4f7..34b9b5a108a2e5d3331061505a138a179f4b65c9 100644 (file)
--- a/servers/vm/arch/i386/Makefile.inc
+++ b/servers/vm/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 #Arch-specific sources
 .PATH: ${.CURDIR}/arch/${ARCH}

diff --git a/share/Makefile b/share/Makefile
index 9b105c7c0ea0c02ea93a98e504fea69cdb0dd297..d5ff58159739a195cf6131d2c629bfcf752bcc61 100644 (file)
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,5 +1,5 @@
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 SUBDIR= zoneinfo
 
-.include <minix.subdir.mk>
+.include <bsd.subdir.mk>

diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 7e676f171b4e66825d06dcd8fc51b4b9dd75d957..2b5c6d60536dbe698ce4a6cdaf0dc51e6c6a3bbe 100644 (file)
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,6 +1,6 @@
 # @(#)Makefile 7.109
 
-.include <minix.own.mk>
+.include <bsd.own.mk>
 
 # Change the line below for your time zone (after finding the zone you want in
 # the time zone files, or adding it to a time zone file).
@@ -109,4 +109,4 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
                        ${.CURDIR}/$$f ${DESTDIR}${TZDIR}; \
        done
 
-.include <minix.prog.mk>
+.include <bsd.prog.mk>