From f93afa00e9749eeda9178378a6c4e5812d61688c Mon Sep 17 00:00:00 2001 From: Thomas Veerman Date: Wed, 6 Jun 2012 11:16:32 +0000 Subject: [PATCH] Remove MINIXSRCDIR and use NETBSDSRCDIR NETBSDSRCDIR is used all over the place anyway, and this reduces our diff with NetBSD a little. --- commands/badblocks/Makefile | 2 +- commands/cdprobe/Makefile | 2 +- commands/crontab/Makefile | 4 +-- commands/df/Makefile | 2 +- commands/dumpcore/Makefile | 2 +- commands/fsck.mfs/Makefile | 4 +-- commands/mdb/Makefile | 2 +- commands/mkfs.mfs/Makefile | 2 +- commands/mount/Makefile | 2 +- commands/service/Makefile | 2 +- commands/tcpdp/Makefile | 2 +- commands/tcpstat/Makefile | 2 +- commands/udpstat/Makefile | 2 +- commands/zdump/Makefile | 2 +- common/include/Makefile.termios.inc | 2 +- common/include/sys/Makefile.inc | 2 +- common/include/sys/Makefile.mount.inc | 2 +- drivers/memory/Makefile | 2 +- drivers/orinoco/Makefile | 2 +- drivers/ramdisk/Makefile | 2 +- drivers/random/Makefile | 2 +- drivers/rtl8139/Makefile | 2 +- drivers/rtl8169/Makefile | 2 +- drivers/tty/Makefile | 2 +- include/arch/i386/include/Makefile.inc | 2 +- include/minix/Makefile | 4 +-- include/sys/Makefile | 2 +- kernel/Makefile | 2 +- lib/libc/gen/Makefile.inc | 4 +-- lib/libc/minix-config.inc | 1 - lib/libcompat_minix/include/Makefile.inc | 2 +- lib/libddekit/build/ddekit/Makefile | 2 +- .../build/ddekit_usb_client/Makefile | 2 +- .../build/ddekit_usb_server/Makefile | 2 +- lib/libl/Makefile | 2 +- lib/libminc/Makefile | 10 +++--- lib/libminlib/Makefile | 4 +-- lib/libsys/Makefile | 2 +- lib/libterminfo/genterms | 4 +-- lib/libterminfo/minix-config.inc | 1 - servers/is/Makefile | 6 ++-- servers/pm/Makefile | 8 ++--- servers/procfs/Makefile | 2 +- servers/rs/Makefile | 2 +- servers/sched/Makefile | 6 ++-- servers/vm/Makefile | 2 +- share/mk/bsd.own.mk | 34 ------------------- tools/Makefile | 8 ++--- 48 files changed, 65 insertions(+), 101 deletions(-) diff --git a/commands/badblocks/Makefile b/commands/badblocks/Makefile index 40097594c..eb519ec9c 100644 --- a/commands/badblocks/Makefile +++ b/commands/badblocks/Makefile @@ -1,5 +1,5 @@ PROG= badblocks -CPPFLAGS+= -I${MINIXSRCDIR}/servers +CPPFLAGS+= -I${NETBSDSRCDIR}/servers MAN= .include diff --git a/commands/cdprobe/Makefile b/commands/cdprobe/Makefile index 3fd7727c8..54ef708cd 100644 --- a/commands/cdprobe/Makefile +++ b/commands/cdprobe/Makefile @@ -1,5 +1,5 @@ PROG= cdprobe -CPPFLAGS+= -I${MINIXSRCDIR}/servers +CPPFLAGS+= -I${NETBSDSRCDIR}/servers MAN= .include diff --git a/commands/crontab/Makefile b/commands/crontab/Makefile index 593897499..5e5dcf0fc 100644 --- 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 diff --git a/commands/df/Makefile b/commands/df/Makefile index a5021d28c..5da1f0fe6 100644 --- 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 2488ed10c..3b469fb13 100644 --- a/commands/dumpcore/Makefile +++ b/commands/dumpcore/Makefile @@ -1,5 +1,5 @@ PROG= dumpcore -CPPFLAGS+= -I${MINIXSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR} MAN= .include diff --git a/commands/fsck.mfs/Makefile b/commands/fsck.mfs/Makefile index 8445c72a8..89e6d38fd 100644 --- 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 99c60bc98..e2b3bc302 100644 --- 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 c4614af11..bef0514ce 100644 --- 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 diff --git a/commands/mount/Makefile b/commands/mount/Makefile index cc76d2e47..0ce9926ef 100644 --- 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 77557867a..8b9604375 100644 --- 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 diff --git a/commands/tcpdp/Makefile b/commands/tcpdp/Makefile index aa9f05f73..0e8bb9c47 100644 --- 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 diff --git a/commands/tcpstat/Makefile b/commands/tcpstat/Makefile index d1d4a5436..7cdd0ace3 100644 --- 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 diff --git a/commands/udpstat/Makefile b/commands/udpstat/Makefile index fa9dc8991..8d0894d5e 100644 --- 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 diff --git a/commands/zdump/Makefile b/commands/zdump/Makefile index 4ec2470bc..2cd30343e 100644 --- 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 diff --git a/common/include/Makefile.termios.inc b/common/include/Makefile.termios.inc index 6346869e8..c3d78b77a 100644 --- a/common/include/Makefile.termios.inc +++ b/common/include/Makefile.termios.inc @@ -1,6 +1,6 @@ .include -.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 702d7d343..88a9a8b98 100644 --- a/common/include/sys/Makefile.inc +++ b/common/include/sys/Makefile.inc @@ -1,6 +1,6 @@ .include -.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 5d7e34c4b..9d59529cf 100644 --- a/common/include/sys/Makefile.mount.inc +++ b/common/include/sys/Makefile.mount.inc @@ -1,5 +1,5 @@ .include -.PATH: ${MINIXSRCDIR}/common/include/sys +.PATH: ${NETBSDSRCDIR}/common/include/sys INCS+= mount.h diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index b6c3ae436..dbe250135 100644 --- 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 db715102c..fbd4da616 100644 --- 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 diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile index 0f0a211de..2763f23d5 100644 --- 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 5a00318b0..050cf87bb 100644 --- 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 diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile index f694c3544..e7d38ec7a 100644 --- a/drivers/rtl8139/Makefile +++ b/drivers/rtl8139/Makefile @@ -13,6 +13,6 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS+= -I${MINIXSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/rtl8169/Makefile b/drivers/rtl8169/Makefile index 4d238d5fc..81729b4b4 100644 --- a/drivers/rtl8169/Makefile +++ b/drivers/rtl8169/Makefile @@ -13,6 +13,6 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS+= -I${MINIXSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 8a2aec399..7d46a7358 100644 --- 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 .include diff --git a/include/arch/i386/include/Makefile.inc b/include/arch/i386/include/Makefile.inc index 83ae0f157..6af7b8762 100644 --- a/include/arch/i386/include/Makefile.inc +++ b/include/arch/i386/include/Makefile.inc @@ -1,5 +1,5 @@ .include -.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 92b56b8c8..ab93226a4 100644 --- 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 diff --git a/include/sys/Makefile b/include/sys/Makefile index 16f7ef774..df653257c 100644 --- 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 -.include "${MINIXSRCDIR}/common/include/sys/Makefile.inc" +.include "${NETBSDSRCDIR}/common/include/sys/Makefile.inc" .include .include diff --git a/kernel/Makefile b/kernel/Makefile index 1b6d23b3c..d3b89326f 100644 --- 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 9960547de..f6a38920f 100644 --- 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 78671f2b7..bdc72dd19 100644 --- 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 4c79a5f99..ab3e5c618 100644 --- 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 50089baab..244b81677 100644 --- 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 5299be4eb..a2684eda8 100644 --- 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 42ab62d45..aa83179fb 100644 --- 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 e7f52363f..44ff34a7c 100644 --- 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 diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile index 299f9e023..8e404a5a4 100644 --- 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 b3f3f470f..6a28afa31 100644 --- 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 07e40425b..1076178f4 100644 --- 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 bbb37f8b1..0404441d8 100755 --- 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 04f98301a..1678da6f0 100644 --- 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 727ffca95..cde8c7ac4 100644 --- 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 edc4f225b..906543213 100644 --- 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 diff --git a/servers/procfs/Makefile b/servers/procfs/Makefile index 6c233fd6b..2697b6e0b 100644 --- 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 2ea097821..c26da0887 100644 --- a/servers/rs/Makefile +++ b/servers/rs/Makefile @@ -9,6 +9,6 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS+= -I${MINIXSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/servers/sched/Makefile b/servers/sched/Makefile index b199099e8..ebfc56cd5 100644 --- 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 diff --git a/servers/vm/Makefile b/servers/vm/Makefile index f4db0becc..a2f27fd5f 100644 --- 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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 4bf5a1af0..69aab94b0 100644 --- 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 8a9da871c..ea566aedd 100644 --- 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 -- 2.44.0