shithub: 9ferno

Download patch

ref: 6cb92dcd421a7ae5e3f363ef225f3909860a546e
parent: 1294b382efd796eb31cac4ee0c61b0ee934b1b55
author: 9ferno <gophone2015@gmail.com>
date: Tue Jul 27 16:34:25 EDT 2021

correcting more BIN locations

--- a/utils/0a/mkfile
+++ b/utils/0a/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/0c/mkfile
+++ b/utils/0c/mkfile
@@ -18,13 +18,13 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
 CFLAGS=	$CFLAGS -I../include
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/0l/mkfile
+++ b/utils/0l/mkfile
@@ -20,7 +20,7 @@
 
 LIBS=bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/5a/mkfile
+++ b/utils/5a/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/5c/mkfile
+++ b/utils/5c/mkfile
@@ -22,11 +22,11 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/5coff/mkfile
+++ b/utils/5coff/mkfile
@@ -15,7 +15,7 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/5cv/mkfile
+++ b/utils/5cv/mkfile
@@ -13,6 +13,6 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/5l/mkfile
+++ b/utils/5l/mkfile
@@ -23,7 +23,7 @@
 
 CFLAGS=$CFLAGS -I../include -I.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/6a/mkfile
+++ b/utils/6a/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/6c/mkfile
+++ b/utils/6c/mkfile
@@ -24,13 +24,13 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
 CFLAGS=	$CFLAGS -I../include
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/6l/mkfile
+++ b/utils/6l/mkfile
@@ -20,7 +20,7 @@
 
 LIBS=bio 9			# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/8a/mkfile
+++ b/utils/8a/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/8c/mkfile
+++ b/utils/8c/mkfile
@@ -25,13 +25,13 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
 CFLAGS=	$CFLAGS -I../include
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/8l/mkfile
+++ b/utils/8l/mkfile
@@ -20,7 +20,7 @@
 
 LIBS=bio 9			# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/acid/mkfile
+++ b/utils/acid/mkfile
@@ -23,7 +23,7 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/awk/mkfile
+++ b/utils/awk/mkfile
@@ -24,6 +24,6 @@
 CFLAGS=$CFLAGS -QIfdiv-
 LDFLAGS=$LDFLAGS setargv.obj
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/c2l/mkfile
+++ b/utils/c2l/mkfile
@@ -26,7 +26,7 @@
 
 LIBS=math bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/cat/mkfile
+++ b/utils/cat/mkfile
@@ -5,6 +5,6 @@
 OFILES=	cat.$O\
 
 LIBS=9
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/cp/mkfile
+++ b/utils/cp/mkfile
@@ -8,7 +8,7 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/cvbit/mkfile
+++ b/utils/cvbit/mkfile
@@ -10,6 +10,6 @@
 
 LIBS=	draw memdraw draw bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/data2c/mkfile
+++ b/utils/data2c/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=bio 9			#order matters
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/echo/mkfile
+++ b/utils/echo/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/format/mkfile
+++ b/utils/format/mkfile
@@ -9,6 +9,6 @@
 
 LIBS=9		# libbio.a uses lib9.a so order matters.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/ftl/mkfile
+++ b/utils/ftl/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9		# libbio.a uses lib9.a so order matters.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/iar/mkfile
+++ b/utils/iar/mkfile
@@ -11,7 +11,7 @@
 
 LIBS=mach bio 9		# libbio.a uses lib9.a so order matters.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/idea/mkfile
+++ b/utils/idea/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=bio 9		# libbio.a uses lib9.a so order matters.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/ka/mkfile
+++ b/utils/ka/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/kc/mkfile
+++ b/utils/kc/mkfile
@@ -22,13 +22,13 @@
 
 LIBS=cc bio 9			# order is important.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
 CFLAGS=	$CFLAGS -I../include
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/kl/mkfile
+++ b/utils/kl/mkfile
@@ -23,7 +23,7 @@
 
 LIBS=bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/kprof/mkfile
+++ b/utils/kprof/mkfile
@@ -6,7 +6,7 @@
 
 LIBS=	mach bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/ksize/mkfile
+++ b/utils/ksize/mkfile
@@ -6,7 +6,7 @@
 
 LIBS=	mach bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/kstrip/mkfile
+++ b/utils/kstrip/mkfile
@@ -6,7 +6,7 @@
 
 LIBS=	mach bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/md5sum/mkfile
+++ b/utils/md5sum/mkfile
@@ -13,7 +13,7 @@
 
 LIBS=9 sec
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/mk/mkfile
+++ b/utils/mk/mkfile
@@ -33,7 +33,7 @@
 
 LIBS=	regexp bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/mkdir/mkfile
+++ b/utils/mkdir/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/mkext/mkfile
+++ b/utils/mkext/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/mkppcimage/mkfile
+++ b/utils/mkppcimage/mkfile
@@ -13,6 +13,6 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/ms2/mkfile
+++ b/utils/ms2/mkfile
@@ -11,6 +11,6 @@
 
 LIBS=mach bio 9			#order matters
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/mv/mkfile
+++ b/utils/mv/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/na/mkfile
+++ b/utils/na/mkfile
@@ -13,6 +13,6 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/ndate/mkfile
+++ b/utils/ndate/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/nm/mkfile
+++ b/utils/nm/mkfile
@@ -7,7 +7,7 @@
 
 LIBS=mach bio 9		# order is important.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/ntsrv/mkfile
+++ b/utils/ntsrv/mkfile
@@ -18,7 +18,7 @@
 
 CFLAGS=$CFLAGS -I.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 SYSLIBS=	$SYSLIBS wsock32.lib user32.lib gdi32.lib advapi32.lib winmm.lib mpr.lib
 
--- a/utils/qa/mkfile
+++ b/utils/qa/mkfile
@@ -14,7 +14,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -23,7 +23,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/qc/mkfile
+++ b/utils/qc/mkfile
@@ -22,11 +22,11 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/ql/mkfile
+++ b/utils/ql/mkfile
@@ -24,7 +24,7 @@
 
 LIBS=bio 9			# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/rcsh/mkfile
+++ b/utils/rcsh/mkfile
@@ -30,7 +30,7 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/rm/mkfile
+++ b/utils/rm/mkfile
@@ -12,7 +12,7 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/sed/mkfile
+++ b/utils/sed/mkfile
@@ -11,6 +11,6 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/sqz/mkfile
+++ b/utils/sqz/mkfile
@@ -12,7 +12,7 @@
 
 LIBS=	mach bio 9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/srclist/mkfile
+++ b/utils/srclist/mkfile
@@ -14,6 +14,6 @@
 
 CFLAGS=$CFLAGS -I../include
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/tc/mkfile
+++ b/utils/tc/mkfile
@@ -18,11 +18,11 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/test/mkfile
+++ b/utils/test/mkfile
@@ -12,7 +12,7 @@
 
 LIBS=9
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/tl/mkfile
+++ b/utils/tl/mkfile
@@ -23,7 +23,7 @@
 
 CFLAGS=$CFLAGS -I../include -I.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
--- a/utils/tr/mkfile
+++ b/utils/tr/mkfile
@@ -8,6 +8,6 @@
 
 LIBS=9		# libbio.a uses lib9.a so order matters.
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
--- a/utils/va/mkfile
+++ b/utils/va/mkfile
@@ -15,7 +15,7 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
@@ -24,7 +24,7 @@
 
 lex.$O:	../cc/macbody ../cc/lexbody
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/vc/mkfile
+++ b/utils/vc/mkfile
@@ -22,13 +22,13 @@
 
 LIBS=cc bio 9		# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE
 
 CFLAGS=	$CFLAGS -I../include
 
-$SRC/$OBJDIR/lib/libcc.a:
+$ROOT/$OBJDIR/lib/libcc.a:
 	cd ../cc
 	mk $MKFLAGS install
 	mk $MKFLAGS clean
--- a/utils/vl/mkfile
+++ b/utils/vl/mkfile
@@ -22,7 +22,7 @@
 
 LIBS=bio 9			# order is important
 
-BIN=$SRC/$OBJDIR/bin
+BIN=$ROOT/$OBJDIR/bin
 
 <$SRC/mkfiles/mkone-$SHELLTYPE