Remove MINIXSRCDIR and use NETBSDSRCDIR

NETBSDSRCDIR is used all over the place anyway, and this reduces
our diff with NetBSD a little.

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

diff --git a/commands/cdprobe/Makefile b/commands/cdprobe/Makefile
index 3fd7727c8b7406443cc26facd05380ef092546df..54ef708cdcc26f13f843782ffde4da41522ec5e3 100644 (file)
--- a/commands/cdprobe/Makefile
+++ b/commands/cdprobe/Makefile
@@ -1,5 +1,5 @@
 PROG=  cdprobe
-CPPFLAGS+= -I${MINIXSRCDIR}/servers
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/crontab/Makefile b/commands/crontab/Makefile
index 59389749965fb1c67abdbc5108ff054c0bfd228f..5e5dcf0fc31c18e379fea77c6537127560764a75 100644 (file)
--- a/commands/crontab/Makefile
+++ b/commands/crontab/Makefile
@@ -4,10 +4,10 @@
 
 PROG=  crontab
 SRCS=  crontab.c tab.c misc.c
-CPPFLAGS+= -I${.CURDIR} -I${MINIXSRCDIR}/commands/cron
+CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/commands/cron
 BINMODE= 4755
 MAN=
 
-.PATH: ${MINIXSRCDIR}/commands/cron
+.PATH: ${NETBSDSRCDIR}/commands/cron
 
 .include <bsd.prog.mk>

diff --git a/commands/df/Makefile b/commands/df/Makefile
index a5021d28c29f3cd73a95d7c2dec309b5b7bbdcd7..5da1f0fe692cddec5d9c8b78f15a49495526439a 100644 (file)
--- a/commands/df/Makefile
+++ b/commands/df/Makefile
@@ -1,5 +1,5 @@
 PROG=  df
-CPPFLAGS+= -I${MINIXSRCDIR}
+CPPFLAGS+= -I${NETBSDSRCDIR}
 BINMODE= 4755
 MAN=
 

diff --git a/commands/dumpcore/Makefile b/commands/dumpcore/Makefile
index 2488ed10c0d5a9683b49f32c12eb6546cecf0782..3b469fb1350158a1bd3b193683e48b3ecac88a82 100644 (file)
--- a/commands/dumpcore/Makefile
+++ b/commands/dumpcore/Makefile
@@ -1,5 +1,5 @@
 PROG=  dumpcore
-CPPFLAGS+= -I${MINIXSRCDIR}
+CPPFLAGS+= -I${NETBSDSRCDIR}
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/fsck.mfs/Makefile b/commands/fsck.mfs/Makefile
index 8445c72a8de3a27c4c6222db9e4229ce9717fcc7..89e6d38fda8c1c772fae83a2f4badf1fe5d399a1 100644 (file)
--- a/commands/fsck.mfs/Makefile
+++ b/commands/fsck.mfs/Makefile
@@ -1,7 +1,7 @@
-FSCK=   ${MINIXSRCDIR}/sbin/fsck
+FSCK=   ${NETBSDSRCDIR}/sbin/fsck
 PROG=  fsck.mfs
 SRCS=  fsck.c
-CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${FSCK}
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers -I${FSCK}
 BINDIR=        /sbin
 MAN=
 

diff --git a/commands/mdb/Makefile b/commands/mdb/Makefile
index 99c60bc984d507b4ab2cf2e27a7b5152fe30efaf..e2b3bc3028712aebd74ebe3209d2e34d8abb2afd 100644 (file)
--- a/commands/mdb/Makefile
+++ b/commands/mdb/Makefile
@@ -19,7 +19,7 @@ DEF_GNU=      -DGNU_SUPPORT
 
 EXTRA_SRCS=    ${FOR_GNU} ${FOR_SYSCALLS}
 EXTRA_DEFS=    ${DEF_GNU} ${DEF_SYSCALLS} ${DEF_DEBUG}
-CPPFLAGS+=     -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers \
+CPPFLAGS+=     -I${NETBSDSRCDIR} -I${NETBSDSRCDIR}/servers \
                 ${EXTRA_DEFS}
 
 PROG=  mdb

diff --git a/commands/mkfs.mfs/Makefile b/commands/mkfs.mfs/Makefile
index c4614af1100f2be3645fa051d35e2c53e3fc0d08..bef0514ce4b753b067000baf89af20ed85d8888c 100644 (file)
--- a/commands/mkfs.mfs/Makefile
+++ b/commands/mkfs.mfs/Makefile
@@ -1,7 +1,7 @@
 PROG=  mkfs.mfs
 SRCS=  mkfs.c
 BINDIR=        /sbin
-CPPFLAGS+= -I${MINIXSRCDIR}/servers
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/mount/Makefile b/commands/mount/Makefile
index cc76d2e478ef2d5484347e28e944044ef911936e..0ce9926efe3ead508268b093a725310ce5642021 100644 (file)
--- a/commands/mount/Makefile
+++ b/commands/mount/Makefile
@@ -1,5 +1,5 @@
 PROG=  mount
-CPPFLAGS+= -I${MINIXSRCDIR}/servers
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers
 BINDIR=        /bin
 BINMODE= 4755
 MAN=

diff --git a/commands/service/Makefile b/commands/service/Makefile
index 77557867afdaf1fa4f711ad3881068777ce92d30..8b96043751462beabd5a47f878a11f9546d57621 100644 (file)
--- a/commands/service/Makefile
+++ b/commands/service/Makefile
@@ -7,6 +7,6 @@ BINDIR= /bin
 MAN.service=
 MAN.printconfig=
 
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include <bsd.prog.mk>

diff --git a/commands/tcpdp/Makefile b/commands/tcpdp/Makefile
index aa9f05f73225ea50ca5ec68ab55215478c543713..0e8bb9c47afead7222563d9a3c742f1212996516 100644 (file)
--- a/commands/tcpdp/Makefile
+++ b/commands/tcpdp/Makefile
@@ -5,6 +5,6 @@ SRCS=   tcpd.c
 CPPFLAGS+= -DPARANOID=1
 MAN=
 
-.PATH: ${MINIXSRCDIR}/commands/tcpd
+.PATH: ${NETBSDSRCDIR}/commands/tcpd
 
 .include <bsd.prog.mk>

diff --git a/commands/tcpstat/Makefile b/commands/tcpstat/Makefile
index d1d4a5436b55b713214449190c3f8ed0c81befde..7cdd0ace36d574017cc9241570b67fc11de0d3fe 100644 (file)
--- a/commands/tcpstat/Makefile
+++ b/commands/tcpstat/Makefile
@@ -1,5 +1,5 @@
 PROG=  tcpstat
-CPPFLAGS+= -I${MINIXSRCDIR}/servers -D'ARGS(a)=a'
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a'
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/udpstat/Makefile b/commands/udpstat/Makefile
index fa9dc89917e500b1f81a8abba15095262f467502..8d0894d5e2704de9c81be07eb41f1cb6d7274ce7 100644 (file)
--- a/commands/udpstat/Makefile
+++ b/commands/udpstat/Makefile
@@ -1,5 +1,5 @@
 PROG=  udpstat
-CPPFLAGS+= -I${MINIXSRCDIR}/servers -D'ARGS(a)=a'
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a'
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/zdump/Makefile b/commands/zdump/Makefile
index 4ec2470bcdee4b304b11fdaa2d90ee1be1509a4b..2cd30343e542d3011325221a5744c581b5635dbc 100644 (file)
--- a/commands/zdump/Makefile
+++ b/commands/zdump/Makefile
@@ -6,6 +6,6 @@ TZDIR=  /usr/share/zoneinfo
 CPPFLAGS+= -DHAVE_ADJTIME=0 -DTZDIR=\"$(TZDIR)\"
 MAN=   zdump.8
 
-.PATH: ${MINIXSRCDIR}/lib/libc/time
+.PATH: ${NETBSDSRCDIR}/lib/libc/time
 
 .include <bsd.prog.mk>

diff --git a/common/include/Makefile.termios.inc b/common/include/Makefile.termios.inc
index 6346869e8beed44f69874bb8352151dfadbe408f..c3d78b77a48ea98bd6982a278b5f0fc25b9aefb7 100644 (file)
--- a/common/include/Makefile.termios.inc
+++ b/common/include/Makefile.termios.inc
@@ -1,6 +1,6 @@
 .include <bsd.own.mk>
 
-.PATH: ${MINIXSRCDIR}/common/include
+.PATH: ${NETBSDSRCDIR}/common/include
 
 INCS+= termios.h       
 

diff --git a/common/include/sys/Makefile.inc b/common/include/sys/Makefile.inc
index 702d7d343e4a2f0a3ff72483d652285c47325f5a..88a9a8b98e9504e2ddb82abaa5ca8338954b3922 100644 (file)
--- a/common/include/sys/Makefile.inc
+++ b/common/include/sys/Makefile.inc
@@ -1,6 +1,6 @@
 .include <bsd.own.mk>
 
-.PATH: ${MINIXSRCDIR}/common/include/sys
+.PATH: ${NETBSDSRCDIR}/common/include/sys
 
 INCS+=         elf64.h elf_common.h elf_generic.h \
        ioc_block.h ioc_fbd.h ioc_file.h ioc_tape.h ioc_disk.h \

diff --git a/common/include/sys/Makefile.mount.inc b/common/include/sys/Makefile.mount.inc
index 5d7e34c4b8307f82cfcc307c7cdb869d1c0b65c6..9d59529cfe256e9dc45e4afc3632505c7f8130d4 100644 (file)
--- a/common/include/sys/Makefile.mount.inc
+++ b/common/include/sys/Makefile.mount.inc
@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
 
-.PATH: ${MINIXSRCDIR}/common/include/sys
+.PATH: ${NETBSDSRCDIR}/common/include/sys
 
 INCS+= mount.h

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index b6c3ae43637c97509fa5da4a7272915f0815911b..dbe250135fe99744af68f33f8cb11bc9d66540c7 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -12,7 +12,7 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS.memory.c+=    -I${MINIXSRCDIR}
+CPPFLAGS.memory.c+=    -I${NETBSDSRCDIR}
 
 imgrd.d: touch-genfiles
 touch-genfiles:

diff --git a/drivers/orinoco/Makefile b/drivers/orinoco/Makefile
index db715102c1ed1a1000fa5a0d4dd4578322628b57..fbd4da616136a0b2d1af58acd8951c6e70142d7e 100644 (file)
--- a/drivers/orinoco/Makefile
+++ b/drivers/orinoco/Makefile
@@ -9,6 +9,6 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS.orinoco.c+=   -I${MINIXSRCDIR}
+CPPFLAGS.orinoco.c+=   -I${NETBSDSRCDIR}
 
 .include <minix.service.mk>

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 0f0a211de18771ba47743bb2b4b88e3b53ddba87..2763f23d5296020b57cd8d8162d3a4b45e7df550 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -27,7 +27,7 @@ PROTO= proto.small
 PROG_DRIVERS+= acpi
 .endif
 
-CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR}
+CPPFLAGS+= -I${NETBSDSRCDIR}/servers
 CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) image image.c t proto.gen
 CLEANFILES += $(LIBRARIES) pwd.db spwd.db
 

diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index 5a00318b07a3bfa56a97d70b839f602414f357e8..050cf87bb98007492ff4acff094afcc95670f2df 100644 (file)
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -11,7 +11,7 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS.random.c+=    -I${MINIXSRCDIR}
+CPPFLAGS.random.c+=    -I${NETBSDSRCDIR}
 
 .include <minix.service.mk>
 

diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile
index f694c35446e7076d722ae5e01fbf48b258759721..e7d38ec7a9232d4345ec131b2bdf6e6c648e8067 100644 (file)
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@@ -13,6 +13,6 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include <minix.service.mk>

diff --git a/drivers/rtl8169/Makefile b/drivers/rtl8169/Makefile
index 4d238d5fcabe878559eb011c8032888d0b8b85bb..81729b4b406067d0ed5428d74312efe7fb93f4cd 100644 (file)
--- a/drivers/rtl8169/Makefile
+++ b/drivers/rtl8169/Makefile
@@ -13,6 +13,6 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include <minix.service.mk>

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 8a2aec3990542bddcf08f17c0490a749a4d82094..7d46a7358626d4ad4c00b5240309119143b0ce56 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -13,7 +13,7 @@ BINDIR?= /usr/sbin
 SUBDIR= keymaps
 
 # Needs kernel/const.h, etc
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include <minix.bootprog.mk>
 .include <bsd.subdir.mk>

diff --git a/include/arch/i386/include/Makefile.inc b/include/arch/i386/include/Makefile.inc
index 83ae0f157208f29ae4fdbea25f9ca1f9d1ebf8aa..6af7b8762ab84c0396cf094dacdb96acdd88010a 100644 (file)
--- a/include/arch/i386/include/Makefile.inc
+++ b/include/arch/i386/include/Makefile.inc
@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
-.PATH: ${MINIXSRCDIR}/common/include/arch/i386
+.PATH: ${NETBSDSRCDIR}/common/include/arch/i386
 
 INCS+= archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
        interrupt.h memory.h multiboot.h partition.h \

diff --git a/include/minix/Makefile b/include/minix/Makefile
index 92b56b8c8766e57db1f53078c0a0ca71971c5ea0..ab93226a4cfbb2e44ca806eb6e17104407627659 100644 (file)
--- a/include/minix/Makefile
+++ b/include/minix/Makefile
@@ -6,7 +6,7 @@ INCSDIR=        /usr/include/minix
 
 INCS+= dirent.h paths.h types.h
 
-.include "${MINIXSRCDIR}/common/include/sys/Makefile.mount.inc"
-.include "${MINIXSRCDIR}/common/include/Makefile.termios.inc"
+.include "${NETBSDSRCDIR}/common/include/sys/Makefile.mount.inc"
+.include "${NETBSDSRCDIR}/common/include/Makefile.termios.inc"
 
 .include <bsd.kinc.mk>

diff --git a/include/sys/Makefile b/include/sys/Makefile
index 16f7ef7744fec472e2506952bdcb150288094606..df653257cd724555b891149a7232e358c8f27627 100644 (file)
--- a/include/sys/Makefile
+++ b/include/sys/Makefile
@@ -55,7 +55,7 @@ namei: namei.src gennameih.awk
        ${TOOL_AWK} -f gennameih.awk < namei.src
 
 .include <bsd.own.mk>
-.include "${MINIXSRCDIR}/common/include/sys/Makefile.inc"
+.include "${NETBSDSRCDIR}/common/include/sys/Makefile.inc"
 
 .include <bsd.files.mk>
 .include <bsd.kinc.mk>

diff --git a/kernel/Makefile b/kernel/Makefile
index 1b6d23b3cac1bd702272ae60e1d754fdfa07bb78..d3b89326f1de7afc4bb208310e359df78bf9965f 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -25,7 +25,7 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
 DPADD+=        ${LIBC}
 .endif
 
-CPPFLAGS+=     -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${NETBSDSRCDIR}
 
 BINDIR=        /usr/sbin
 MAN=

diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 9960547de085443df8b0707dfaa0e00fd90136e7..f6a38920fcffb909f55c484390d1cba81411af59 100644 (file)
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -213,8 +213,8 @@ CPPFLAGS.tolower_.c+=       -I${LIBCDIR}/locale
 CPPFLAGS.toupper_.c+=  -I${LIBCDIR}/locale
 
 .if defined(__MINIX)
-errlist.c: errlist.awk ${MINIXSRCDIR}/include/sys/errno.h
-       cat ${MINIXSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${MINIXSRCDIR}/lib/libc/gen/errlist.awk > ${.TARGET}
+errlist.c: errlist.awk ${NETBSDSRCDIR}/include/sys/errno.h
+       cat ${NETBSDSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk > ${.TARGET}
 .else
 errlist.c: errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
        ${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET}

diff --git a/lib/libc/minix-config.inc b/lib/libc/minix-config.inc
index 78671f2b73956bb415d8326801720b9f6e731d57..bdc72dd198035a283f4dd19f0c5f4264673be23e 100644 (file)
--- a/lib/libc/minix-config.inc
+++ b/lib/libc/minix-config.inc
@@ -1,4 +1,3 @@
-NETBSDSRCDIR=  ${MINIXSRCDIR}
 NETBSDINCLUDES= /usr/include/
 
 CITRUS=yes 

diff --git a/lib/libcompat_minix/include/Makefile.inc b/lib/libcompat_minix/include/Makefile.inc
index 4c79a5f99de0d4c589fb9a2c9295eb2802f7a7ec..ab3e5c6185a4d637b4a5f2301ce3f0fc96434bce 100644 (file)
--- a/lib/libcompat_minix/include/Makefile.inc
+++ b/lib/libcompat_minix/include/Makefile.inc
@@ -1,4 +1,4 @@
-.PATH: ${MINIXSRCDIR}/lib/libcompat_minix/include
+.PATH: ${NETBSDSRCDIR}/lib/libcompat_minix/include
 
 INCSDIR= /usr/include
 

diff --git a/lib/libddekit/build/ddekit/Makefile b/lib/libddekit/build/ddekit/Makefile
index 50089baab2f4c908321b2204981fde50adec9e24..244b81677ded27adff29a4d4361c2d0d240d4d83 100644 (file)
--- a/lib/libddekit/build/ddekit/Makefile
+++ b/lib/libddekit/build/ddekit/Makefile
@@ -1,7 +1,7 @@
 
 LIB=           ddekit
 
-SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src 
+SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
 
 VPATH = $(SRC_DIR) 
 

diff --git a/lib/libddekit/build/ddekit_usb_client/Makefile b/lib/libddekit/build/ddekit_usb_client/Makefile
index 5299be4eb59fe6d01bc4bf363b78beb02bc98cd5..a2684eda8887f944d87f6e218659cbcc89de276c 100644 (file)
--- a/lib/libddekit/build/ddekit_usb_client/Makefile
+++ b/lib/libddekit/build/ddekit_usb_client/Makefile
@@ -1,6 +1,6 @@
 LIB=           ddekit_usb_client
 
-SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src 
+SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
 
 VPATH = $(SRC_DIR) 
 

diff --git a/lib/libddekit/build/ddekit_usb_server/Makefile b/lib/libddekit/build/ddekit_usb_server/Makefile
index 42ab62d45950b05bc75e8cac86ff320a35285154..aa83179fbecafdaffb24c59d11ee75d1f44cc249 100644 (file)
--- a/lib/libddekit/build/ddekit_usb_server/Makefile
+++ b/lib/libddekit/build/ddekit_usb_server/Makefile
@@ -1,5 +1,5 @@
 LIB=           ddekit_usb_server
-SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src 
+SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
 VPATH = $(SRC_DIR) 
 SRCS = usb_server.c
 CFLAGS += -Wall

diff --git a/lib/libl/Makefile b/lib/libl/Makefile
index e7f52363f61131b791e8b933643269eb43040a4d..44ff34a7c53f6bd49e01e0dd70f8d3c8d6f8b2ee 100644 (file)
--- a/lib/libl/Makefile
+++ b/lib/libl/Makefile
@@ -7,6 +7,6 @@ SRCS=           libmain.c libyywrap.c
 
 LINKS=         ${LIBDIR}/libl.a ${LIBDIR}/libfl.a
 
-.PATH:         ${MINIXSRCDIR}/commands/lex
+.PATH:         ${NETBSDSRCDIR}/commands/lex
 
 .include <bsd.lib.mk>

diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile
index 299f9e0239ba776494bbb0d35d9d20f6785a08fe..8e404a5a4060647254f34ef975bf9277b8263877 100644 (file)
--- a/lib/libminc/Makefile
+++ b/lib/libminc/Makefile
@@ -6,16 +6,16 @@
 
 LIB=           minc
 
-CPPFLAGS.sched_start.c+=       -I${MINIXSRCDIR}
+CPPFLAGS.sched_start.c+=       -I${NETBSDSRCDIR}
 
-LIBCSRCDIR=${MINIXSRCDIR}/lib/libc
+LIBCSRCDIR=${NETBSDSRCDIR}/lib/libc
 
 MACHINE_ARCH=${MACHINE}
 
 #
 # Shared libc with userspace (/common/lib/libc)
 #
-.include "${MINIXSRCDIR}/common/lib/libc/Makefile.inc"
+.include "${NETBSDSRCDIR}/common/lib/libc/Makefile.inc"
 .include "${.CURDIR}/arch/${MACHINE}/Makefile.libc.inc"
 .if empty(SRCS:Mbyte_swap_8.*)
 SRCS+= bswap64.c
@@ -75,8 +75,8 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/stdlib -I${LIBCSRCDIR}/include
 # Import from gen
 
 errlist.c: ${LIBCSRCDIR}/gen/errlist.awk \
-          ${MINIXSRCDIR}/include/sys/errno.h
-       cat ${MINIXSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${LIBCSRCDIR}/gen/errlist.awk > ${.TARGET}
+          ${NETBSDSRCDIR}/include/sys/errno.h
+       cat ${NETBSDSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${LIBCSRCDIR}/gen/errlist.awk > ${.TARGET}
 
 .for i in assert.c _errno.c errno.c _env.c errlist.c \
        execle.c getprogname.c sleep.c time.c \

diff --git a/lib/libminlib/Makefile b/lib/libminlib/Makefile
index b3f3f470ff661cb8e7594fc56e8b79897a932b6d..6a28afa3141f420cdc9a86d8661dd41764aae631 100644 (file)
--- a/lib/libminlib/Makefile
+++ b/lib/libminlib/Makefile
@@ -5,8 +5,8 @@ LIB=    minlib
 
 USE_SHLIBDIR= yes
 
-CPPFLAGS.fslib.c+= -I${MINIXSRCDIR}/servers
-CPPFLAGS.fsversion.c+= -I${MINIXSRCDIR}/servers
+CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/servers
+CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/servers
 SRCS+=         fslib.c fsversion.c
 
 # DHCP get/set tags.

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index 07e40425ba690d38c24b8e23fcd4bcd19afaf20e..1076178f45b640ab5b198a08909fb0fc5073e6ab 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -143,7 +143,7 @@ CPPFLAGS+= -DUSE_LIVEUPDATE
 CPPFLAGS+= -DUSE_SYSDEBUG
 .endif
 
-CPPFLAGS.sched_start.c+=       -I${MINIXSRCDIR}
+CPPFLAGS.sched_start.c+=       -I${NETBSDSRCDIR}
 
 .if (${CC} == "gcc") || (${CC} == "clang")
 LDADD+=        -lminc

diff --git a/lib/libterminfo/genterms b/lib/libterminfo/genterms
index bbb37f8b141ddd8816488cf3f51836bc1377442d..0404441d87093cca3d0cf798e3e9c6ce6fed6ce8 100755 (executable)
--- a/lib/libterminfo/genterms
+++ b/lib/libterminfo/genterms
@@ -31,8 +31,8 @@
 
 set -e
 : ${TOOL_TIC:=tic}
-: ${MINIXSRCDIR:=/usr/src}
-: ${TERMINFO:=${MINIXSRCDIR}/share/terminfo/terminfo}
+: ${NETBSDSRCDIR:=/usr/src}
+: ${TERMINFO:=${NETBSDSRCDIR}/share/terminfo/terminfo}
 
 echo "/* \$NetBSD\$ */"
 echo "/* * * MODIFIED FOR MINIX * * */"

diff --git a/lib/libterminfo/minix-config.inc b/lib/libterminfo/minix-config.inc
index 04f98301aa2488258ccbe6d8965afaf00e2fcf3f..1678da6f0bceabd1b06a88e3fa0c06809d34b7c2 100644 (file)
--- a/lib/libterminfo/minix-config.inc
+++ b/lib/libterminfo/minix-config.inc
@@ -1,4 +1,3 @@
-NETBSDSRCDIR=  ${MINIXSRCDIR}
 NETBSDINCLUDES= /usr/include/
 
 CPPFLAGS+=     -D_NETBSD_SOURCE

diff --git a/servers/is/Makefile b/servers/is/Makefile
index 727ffca953f38576083079312af5ff5d1bd37a6c..cde8c7ac4716307f6b63294c7e8192b7cfdb9ddf 100644 (file)
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@@ -13,9 +13,9 @@ MAN=
 
 BINDIR?= /sbin
 
-CPPFLAGS.dmp_kernel.c+=        -I${MINIXSRCDIR}
-CPPFLAGS.dmp_rs.c+=    -I${MINIXSRCDIR}
-CPPFLAGS.dmp_vm.c+=    -I${MINIXSRCDIR}
+CPPFLAGS.dmp_kernel.c+=        -I${NETBSDSRCDIR}
+CPPFLAGS.dmp_rs.c+=    -I${NETBSDSRCDIR}
+CPPFLAGS.dmp_vm.c+=    -I${NETBSDSRCDIR}
 
 # This setting must match the kernel's, as it affects the IRQ hooks table size.
 .if ${USE_APIC} != "no"

diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index edc4f225b15ac693783b40002e0ca338b5070d9a..906543213b8f7c92dbd63871ff7733fe20a4ac01 100644 (file)
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -23,9 +23,9 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS.main.c+=      -I${MINIXSRCDIR}
-CPPFLAGS.misc.c+=      -I${MINIXSRCDIR}
-CPPFLAGS.schedule.c+=  -I${MINIXSRCDIR}
-CPPFLAGS.utility.c+=   -I${MINIXSRCDIR}
+CPPFLAGS.main.c+=      -I${NETBSDSRCDIR}
+CPPFLAGS.misc.c+=      -I${NETBSDSRCDIR}
+CPPFLAGS.schedule.c+=  -I${NETBSDSRCDIR}
+CPPFLAGS.utility.c+=   -I${NETBSDSRCDIR}
 
 .include <minix.bootprog.mk>

diff --git a/servers/procfs/Makefile b/servers/procfs/Makefile
index 6c233fd6bc2abd2b2e3190904932e46998396c97..2697b6e0b1f1e06ea77273a60799b2f7c69e1c0e 100644 (file)
--- a/servers/procfs/Makefile
+++ b/servers/procfs/Makefile
@@ -6,7 +6,7 @@
 PROG=  procfs
 SRCS=  buf.c main.c pid.c root.c tree.c util.c cpuinfo.c
 
-CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers
+CPPFLAGS+= -I${NETBSDSRCDIR} -I${NETBSDSRCDIR}/servers
 
 DPADD+=        ${LIBVTREEFS} ${LIBSYS}
 LDADD+=        -lvtreefs -lsys

diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index 2ea097821561a16fe48fb48c37422e3cbf11f79d..c26da0887103969d4ed90057f25e90bb625d249d 100644 (file)
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -9,6 +9,6 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include <minix.bootprog.mk>

diff --git a/servers/sched/Makefile b/servers/sched/Makefile
index b199099e8152c22b177837a26ec61d1258e1eb13..ebfc56cd5314b1b46610366f0a685292ae1f5236 100644 (file)
--- a/servers/sched/Makefile
+++ b/servers/sched/Makefile
@@ -9,8 +9,8 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS.main.c+=      -I${MINIXSRCDIR}
-CPPFLAGS.schedule.c+=  -I${MINIXSRCDIR}
-CPPFLAGS.utility.c+=   -I${MINIXSRCDIR}
+CPPFLAGS.main.c+=      -I${NETBSDSRCDIR}
+CPPFLAGS.schedule.c+=  -I${NETBSDSRCDIR}
+CPPFLAGS.utility.c+=   -I${NETBSDSRCDIR}
 
 .include <minix.bootprog.mk>

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index f4db0beccf6bcd74f973b37638273de8f41f7afc..a2f27fd5f10aa04c78d559983bf7bd58c6495d0a 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -14,7 +14,7 @@ MAN=
 BINDIR?= /usr/sbin
 
 CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}
-CPPFLAGS+=     -I${MINIXSRCDIR}
+CPPFLAGS+=     -I${NETBSDSRCDIR}
 
 .include "arch/${ARCH}/Makefile.inc"
 .include <minix.bootprog.mk>

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4bf5a1af024bf00584722b89e03811e69e825c9e..69aab94b0f51aec30c482b071f8fa03090cc542c 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -94,40 +94,6 @@ PRINTOBJDIR= echo # prevent infinite recursion
 .endif
 
 
-
-#
-# Determine if running in the MINIX source tree by checking for the
-# existence of usr.bin and tools/ in the current or a parent directory,
-# and setting _MSRC_TOP_ to the result.
-#
-.if !defined(_MSRC_TOP_)               # {
-_MSRC_TOP_!= cd ${.CURDIR}; while :; do \
-               here=`pwd`; \
-               [ -d usr.bin ] && [ -d tools ] && { echo $$here; break; }; \
-               case $$here in /) echo ""; break;; esac; \
-               cd ..; done
-
-.MAKEOVERRIDES+=       _MSRC_TOP_
-
-.endif                                 # }
-
-#
-# If _MSRC_TOP_ != "", we're within the MINIX source tree, so set
-# defaults for MINIXSRCDIR and _MSRC_TOP_OBJ_.
-#
-.if (${_MSRC_TOP_} != "")              # {
-
-MINIXSRCDIR?=  ${_MSRC_TOP_}
-
-.if !defined(_MSRC_TOP_OBJ_)
-_MSRC_TOP_OBJ_!=       cd ${_MSRC_TOP_} && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=       _MSRC_TOP_OBJ_
-.endif
-
-.endif # _MSRC_TOP_ != ""              # }
-
-
-
 #
 # Determine if running in the NetBSD source tree by checking for the
 # existence of build.sh and tools/ in the current or a parent directory,

diff --git a/tools/Makefile b/tools/Makefile
index 8a9da871c930a07881f97bd848de78efbab94efd..ea566aedd9a8a532d28ccf96369be262ae9fbd01 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -127,15 +127,15 @@ nbsd_fetch:
                date=$$1; minixpath=$$2; origpath=$$3;                          \
                if [ $$# -lt 3 ]; then origpath=$$2; fi;                        \
                echo "retrieving $$origpath ..";                                \
-               cd ${MINIXSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
+               cd ${NETBSDSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
        done
 
 nbsd_diff:
-       find ${MINIXSRCDIR} -name minix-port.patch | xargs rm
+       find ${NETBSDSRCDIR} -name minix-port.patch | xargs rm
        cat nbsd_ports | grep -v '^#' | \
-       ( cd ${MINIXSRCDIR} && awk -F, '{ minixpath=$$2; origpath=$$3; if(NF < 3) { origpath=$$2; } system("sh tools/nbsd_diff.sh " \
+       ( cd ${NETBSDSRCDIR} && awk -F, '{ minixpath=$$2; origpath=$$3; if(NF < 3) { origpath=$$2; } system("sh tools/nbsd_diff.sh " \
           "nbsdsrc/src/"origpath" "minixpath" "minixpath"/minix-port.patch");}' )
-       find ${MINIXSRCDIR} -name minix-port.patch | xargs wc -l | sort -n
+       find ${NETBSDSRCDIR} -name minix-port.patch | xargs wc -l | sort -n
 
 
 # clean up compile results