ref: 1294b382efd796eb31cac4ee0c61b0ee934b1b55
parent: c52aa4936cee1c8a41c53aefe629a25de3560387
author: 9ferno <gophone2015@gmail.com>
date: Tue Jul 27 04:34:08 EDT 2021
fixes to support the change separating SRC and ROOT directories
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,8 @@
echo >>mkconfig SYSTARG=Linux; \
echo >>mkconfig OBJTYPE=386; \
echo >>mkconfig 'OBJDIR=$SYSTARG/$OBJTYPE'; \
-echo >>mkconfig '<$ROOT/mkfiles/mkhost-$SYSHOST'; \
-echo >>mkconfig '<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE'
+echo >>mkconfig '<$SRC/mkfiles/mkhost-$SYSHOST'; \
+echo >>mkconfig '<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE'
# build code
RUN ./makemk.sh
--- a/MacOSX/README
+++ b/MacOSX/README
@@ -63,7 +63,7 @@
The following modification was added to various 'mkfile' to support required redefinition of varios core functions.
- <$ROOT/mkfiles/mkalloc-$SYSHOST-$OBJTYPE
+ <$SRC/mkfiles/mkalloc-$SYSHOST-$OBJTYPE
Some of the base libraries and utils will have *.pbproj files which were used to bootstrap the initial build system on Mac OS X (Public Beta).
--- a/appl/cmd/mk/mkconfig
+++ b/appl/cmd/mk/mkconfig
@@ -24,5 +24,5 @@
#
OBJDIR=$SYSTARG/$OBJTYPE
-<$ROOT/mkfiles/mkhost-$SYSHOST # variables appropriate for host system
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE # variables used to build target object type
+<$SRC/mkfiles/mkhost-$SYSHOST # variables appropriate for host system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE # variables used to build target object type
--- a/emu/AIX/mkfile
+++ b/emu/AIX/mkfile
@@ -14,7 +14,7 @@
X11LIBS= -lX11 -lXext
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
<mkfile-$OBJTYPE
--- a/emu/DragonFly/mkfile
+++ b/emu/DragonFly/mkfile
@@ -14,7 +14,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/FreeBSD/mkfile
+++ b/emu/FreeBSD/mkfile
@@ -12,7 +12,7 @@
X11LIBS= -lX11 -lXext
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/Irix/mkfile
+++ b/emu/Irix/mkfile
@@ -14,7 +14,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/Linux/mkfile
+++ b/emu/Linux/mkfile
@@ -10,7 +10,7 @@
X11LIBS= -lX11 -lXext # can remove or override using env section in config files
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
<mkfile-$OBJTYPE # sets $ARCHFILES
--- a/emu/MacOSX/mkfile
+++ b/emu/MacOSX/mkfile
@@ -12,7 +12,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/MacOSX/mkfile-g
+++ b/emu/MacOSX/mkfile-g
@@ -12,7 +12,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/MacOSX/mkfile-x11
+++ b/emu/MacOSX/mkfile-x11
@@ -12,7 +12,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/NetBSD/mkfile
+++ b/emu/NetBSD/mkfile
@@ -13,7 +13,7 @@
# can remove or override X11LIBS using env section in config files
X11LIBS= -L/usr/X11R7/lib -R/usr/X11R7/lib -lXext -lX11
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/Nt/mkfile
+++ b/emu/Nt/mkfile
@@ -18,7 +18,7 @@
OSX=os
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/OpenBSD/mkfile
+++ b/emu/OpenBSD/mkfile
@@ -8,7 +8,7 @@
INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is installed
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
@@ -24,7 +24,7 @@
HFILES=\
-CFLAGS='-DROOT="'$ROOT'"' -DEMU -I. -I../port -I$ROOT/$SYSTARG/$OBJTYPE/include -I$ROOT/include -I$ROOT/libinterp $CTHREADFLAGS $CFLAGS $EMUOPTIONS
+CFLAGS='-DROOT="'$ROOT'"' -DEMU -I. -I../port -I$SRC/$SYSTARG/$OBJTYPE/include -I$SRC/include -I$SRC/libinterp $CTHREADFLAGS $CFLAGS $EMUOPTIONS
SYSLIBS= -lm -lX11 -lXext -lossaudio -lpthread
KERNDATE=`{$NDATE}--- a/emu/Plan9/mkfile
+++ b/emu/Plan9/mkfile
@@ -12,7 +12,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/Solaris/mkfile
+++ b/emu/Solaris/mkfile
@@ -14,7 +14,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/emu/Unixware/mkfile
+++ b/emu/Unixware/mkfile
@@ -14,7 +14,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
--- a/lib/emptydirs
+++ b/lib/emptydirs
@@ -50,6 +50,9 @@
OpenBSD/386/bin
OpenBSD/386/include
OpenBSD/386/lib
+OpenBSD/amd64/bin
+OpenBSD/amd64/include
+OpenBSD/amd64/lib
OpenBSD/arm/bin
OpenBSD/arm/include
OpenBSD/arm/lib
@@ -122,6 +125,7 @@
usr/inferno/charon
usr/inferno/keyring
usr/inferno/tmp
+utils/lib/
services/collab/export/services
services/collab/export/collab
acme/acid
--- a/lib/mk/mkconfig
+++ b/lib/mk/mkconfig
@@ -24,5 +24,5 @@
#
OBJDIR=$SYSTARG/$OBJTYPE
-<$ROOT/mkfiles/mkhost-$SYSHOST # variables appropriate for host system
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE # variables used to build target object type
+<$SRC/mkfiles/mkhost-$SYSHOST # variables appropriate for host system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE # variables used to build target object type
--- a/libmp/Inferno-386/mkfile
+++ b/libmp/Inferno-386/mkfile
@@ -19,4 +19,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Inferno-mips/mkfile
+++ b/libmp/Inferno-mips/mkfile
@@ -18,4 +18,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Inferno-power/mkfile
+++ b/libmp/Inferno-power/mkfile
@@ -17,4 +17,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Plan9-386/mkfile
+++ b/libmp/Plan9-386/mkfile
@@ -18,4 +18,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Plan9-amd64/mkfile
+++ b/libmp/Plan9-amd64/mkfile
@@ -18,4 +18,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Plan9-mips/mkfile
+++ b/libmp/Plan9-mips/mkfile
@@ -18,4 +18,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libmp/Plan9-power/mkfile
+++ b/libmp/Plan9-power/mkfile
@@ -17,4 +17,4 @@
$HFILES\
$SFILES\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libsec/Inferno-386/mkfile
+++ b/libsec/Inferno-386/mkfile
@@ -14,4 +14,4 @@
OFILES=${FILES:%=%.$O}-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libsec/Inferno-mips/mkfile
+++ b/libsec/Inferno-mips/mkfile
@@ -13,4 +13,4 @@
OFILES=${FILES:%=%.$O}-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libsec/Plan9-386/mkfile
+++ b/libsec/Plan9-386/mkfile
@@ -13,4 +13,4 @@
OFILES=${FILES:%=%.$O}-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/libsec/Plan9-mips/mkfile
+++ b/libsec/Plan9-mips/mkfile
@@ -13,4 +13,4 @@
OFILES=${FILES:%=%.$O}-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/mkfile
+++ b/mkfile
@@ -44,19 +44,19 @@
foo:QV:
echo mk all, clean, install, installall or nuke
-all:V: mkrootdir all-$HOSTMODEL
+all:V: all-$HOSTMODEL
clean:V: clean-$HOSTMODEL
-install:V: mkrootdir install-$HOSTMODEL
-installall:V: mkrootdir installall-$HOSTMODEL
+install:V: install-$HOSTMODEL
+installall:V: installall-$HOSTMODEL
emu:V: emu/all-$HOSTMODEL
-emuinstall:V: mkrootdir emu/install-$HOSTMODEL
+emuinstall:V: emu/install-$HOSTMODEL
emuclean:V: emu/clean-$HOSTMODEL
emunuke:V: emu/nuke-$HOSTMODEL
kernel:V: kernel/all-$HOSTMODEL
kernelall:V: kernel/all-$HOSTMODEL
kernelclean:V: kernel/clean-$HOSTMODEL
-kernelinstall:V: mkrootdir kernel/install-$HOSTMODEL
-kernelinstallall:V: mkrootdir kernel/installall-$HOSTMODEL
+kernelinstall:V: kernel/install-$HOSTMODEL
+kernelinstallall:V: kernel/installall-$HOSTMODEL
kernelnuke:V: kernel/nuke-$HOSTMODEL
nuke:V: nuke-$HOSTMODEL
@@ -66,7 +66,9 @@
nukedist:V: nuke
rm -f $ROOT/$OBJDIR/bin/*.exe
rm -f $ROOT/$OBJDIR/lib/lib*.a
-
+
+&/install-& install-& &/installall-& installall-&:QV: mkrootdir
+
&-Posix:QV:
for j in $DIRS utils tools
do
@@ -208,11 +210,11 @@
mkrootdir-sh:V:
test -d $ROOT || mkdir $ROOT
- for (d in doc fonts icons lib locale man module services usr)
- {+ for d in doc fonts icons lib locale man module services usr
+ do
echo cp -a $SRC/$d $ROOT/
cp -a $SRC/$d $ROOT/
- }
+ done
mkrootdir-nt:V:
test -d $ROOT || mkdir $ROOT
--- a/os/boot.original/arm1110/mkfile
+++ b/os/boot.original/arm1110/mkfile
@@ -10,7 +10,7 @@
libkern\
LIBFILES=${LIBS:%=$LIBDIR/%.a}-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE
BIN=$ROOT/Inferno/$OBJTYPE
--- a/os/boot.original/libflate/mkfile
+++ b/os/boot.original/libflate/mkfile
@@ -18,4 +18,4 @@
$ROOT/include/flate.h\
zlib.h\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/os/boot.original/mpc/mkfile
+++ b/os/boot.original/mpc/mkfile
@@ -2,7 +2,7 @@
OBJTYPE=power # always
<../../../mkconfig
SYSTARG=$OSTARG # always
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
ARCH=fads # selects board dependent code
TARG=qb$ARCH
--- a/os/boot.original/pc/mkfile
+++ b/os/boot.original/pc/mkfile
@@ -10,7 +10,7 @@
libkern\
LIBFILES=${LIBS:%=$LIBDIR/%.a}-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE
BIN=$ROOT/Inferno/$OBJTYPE
--- a/os/boot.original/puma/mkfile
+++ b/os/boot.original/puma/mkfile
@@ -2,7 +2,7 @@
SYSTARG=Inferno
OBJTYPE=arm
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
TARGET=${O}bootOBJ=\
--- a/os/boot.original/rpcg/mkfile
+++ b/os/boot.original/rpcg/mkfile
@@ -2,7 +2,7 @@
OBJTYPE=power # always
<../../../mkconfig
SYSTARG=$OSTARG # always
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
CONF=rpcg # selects board dependent code
TARG=qb$CONF
--- a/os/cerf1110/mkfile
+++ b/os/cerf1110/mkfile
@@ -11,7 +11,7 @@
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/cerf250/mkfile
+++ b/os/cerf250/mkfile
@@ -11,7 +11,7 @@
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/cerf405/mkfile
+++ b/os/cerf405/mkfile
@@ -15,7 +15,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/fads/mkfile
+++ b/os/fads/mkfile
@@ -16,7 +16,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/ipaq1110/mkfile
+++ b/os/ipaq1110/mkfile
@@ -11,7 +11,7 @@
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/ipengine/mkfile
+++ b/os/ipengine/mkfile
@@ -15,7 +15,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/js/mkfile
+++ b/os/js/mkfile
@@ -13,7 +13,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/ks32/mkfile
+++ b/os/ks32/mkfile
@@ -10,7 +10,7 @@
INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is installed
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/manga/mkfile
+++ b/os/manga/mkfile
@@ -10,7 +10,7 @@
INSTALLDIR=$ROOT/Inferno/$OBJTYPE #path of directory where kernel is installed
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/os/rpcg/mkfile
+++ b/os/rpcg/mkfile
@@ -15,7 +15,7 @@
#end configurable parameters
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
+<$SRC/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS
--- a/tests/mkfile
+++ b/tests/mkfile
@@ -16,4 +16,4 @@
BIN=$ROOT/$OBJDIR/bin
-<$ROOT/mkfiles/mkmany-$SHELLTYPE
+<$SRC/mkfiles/mkmany-$SHELLTYPE
--- a/tools/db/mkfile
+++ b/tools/db/mkfile
@@ -10,4 +10,4 @@
SYSLIBS= -liodbc
-<$ROOT/mkfiles/mkone-$SHELLTYPE
+<$SRC/mkfiles/mkone-$SHELLTYPE
--- a/tools/libstyx/mkfile
+++ b/tools/libstyx/mkfile
@@ -8,4 +8,4 @@
HFILES=\
-<$ROOT/mkfiles/mksyslib-$SHELLTYPE
+<$SRC/mkfiles/mksyslib-$SHELLTYPE
--- a/tools/mkfile
+++ b/tools/mkfile
@@ -4,4 +4,4 @@
libstyx\
styxtest\
-<$ROOT/mkfiles/mksubdirs
+<$SRC/mkfiles/mksubdirs
--- a/tools/odbc/mkfile
+++ b/tools/odbc/mkfile
@@ -14,6 +14,6 @@
<mkfile-$SYSTARG
-<$ROOT/mkfiles/mkone-$SHELLTYPE
+<$SRC/mkfiles/mkone-$SHELLTYPE
CFLAGS= $CFLAGS -I../libstyx
--- a/tools/styxtest/mkfile
+++ b/tools/styxtest/mkfile
@@ -14,7 +14,7 @@
<mkfile-$SYSTARG
-<$ROOT/mkfiles/mkone-$SHELLTYPE
+<$SRC/mkfiles/mkone-$SHELLTYPE
CFLAGS= $CFLAGS -I../libstyx
--- a/utils/iyacc/mkfile
+++ b/utils/iyacc/mkfile
@@ -14,7 +14,7 @@
CFLAGS= $CFLAGS -I../include '-DSRC="'$SRC'"' '-DROOT="'$ROOT'"' '-DPARSER="yaccpar"' '-DPARSERS="yaccpar"'
-install:V: $SRC/utils/lib/yaccpar
+install:V: $ROOT/utils/lib/yaccpar
-$SRC/utils/lib/yaccpar: yaccpar
+$ROOT/utils/lib/yaccpar: yaccpar
rm -f $target && cp $prereq $target