Removing path harcodings to use bind mounts

amd64/mkfile

@@ -1,4 +1,4 @@
-<$ROOT/sys/src/mkfile.proto
+</sys/src/mkfile.proto
 
 #CC=6c
 #LD=6l

sys/src/lib9p/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/lib9p.a
+LIB=/$objtype/lib/lib9p.a
 OFILES=\
 	auth.$O\
 	dirread.$O\
@@ -18,7 +18,7 @@ OFILES=\
 	uid.$O\
 	util.$O\
 
-HFILES=$ROOT/sys/include/9p.h
+HFILES=/sys/include/9p.h
 
 UPDATE=\
 	mkfile\
@@ -26,7 +26,7 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
 $O.ramfs: ramfs.$O $LIB
 	$LD -o $target $prereq

sys/src/libString/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libString.a
+LIB=/$objtype/lib/libString.a
 
 OFILES=\
 	s_alloc.$O\
@@ -21,7 +21,7 @@ OFILES=\
 	s_tolower.$O\
 	s_unique.$O\
 
-HFILES=$ROOT/sys/include/String.h
+HFILES=/sys/include/String.h
 
 UPDATE=\
 	mkfile\
@@ -29,4 +29,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libauth/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libauth.a
+LIB=/$objtype/lib/libauth.a
 OFILES=\
 	amount.$O\
 	amount_getkey.$O\
@@ -20,7 +20,7 @@ OFILES=\
 	noworld.$O\
 
 HFILES=\
-	$ROOT/sys/include/auth.h\
+	/sys/include/auth.h\
 	authlocal.h\
 
 UPDATE=\
@@ -29,4 +29,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libauthsrv/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libauthsrv.a
+LIB=/$objtype/lib/libauthsrv.a
 OFILES=\
 	_asgetticket.$O\
 	_asrdresp.$O\
@@ -19,7 +19,7 @@ OFILES=\
 	readnvram.$O\
 
 HFILES=\
-	$ROOT/sys/include/authsrv.h\
+	/sys/include/authsrv.h\
 
 UPDATE=\
 	mkfile\
@@ -27,4 +27,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libavl/mkfile

@@ -1,10 +1,10 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libavl.a
+LIB=/$objtype/lib/libavl.a
 OFILES=\
 	avl.$O\
 
-HFILES=$ROOT/sys/include/avl.h
+HFILES=/sys/include/avl.h
 
 UPDATE=\
 	mkfile\
@@ -12,4 +12,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libbin/mkfile

@@ -1,11 +1,11 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libbin.a
+LIB=/$objtype/lib/libbin.a
 OFILES=\
 	bin.$O\
 
 HFILES=\
-	$ROOT/sys/include/bin.h\
+	/sys/include/bin.h\
 
 UPDATE=\
 	mkfile\
@@ -13,4 +13,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libbio/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libbio.a
+LIB=/$objtype/lib/libbio.a
 OFILES=\
 	bbuffered.$O\
 	bfildes.$O\
@@ -20,7 +20,7 @@ OFILES=\
 	bwrite.$O\
 	bvprint.$O\
 
-HFILES=$ROOT/sys/include/bio.h
+HFILES=/sys/include/bio.h
 
 UPDATE=\
 	mkfile\
@@ -28,5 +28,5 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 

sys/src/libc/amd64/mkfile

@@ -1,7 +1,7 @@
 objtype=amd64
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libc.a
+LIB=/$objtype/lib/libc.a
 SFILES=\
 #	argv0.s\
 #	atom.s\
@@ -35,7 +35,7 @@ CFILES=\
 	argv0.c\
 	rdpmc.c\
 
-HFILES=$ROOT/sys/include/libc.h
+HFILES=/sys/include/libc.h
 
 OFILES=${CFILES:%.c=%.$O} ${SFILES:%.s=%.$O} ${GSFILES:%.S=%.$O}
 
@@ -44,4 +44,4 @@ UPDATE=mkfile\
 	$CFILES\
 	$SFILES\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libc/fmt/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libc.a
+LIB=/$objtype/lib/libc.a
 
 OFILES=\
 	dofmt.$O\
@@ -34,7 +34,7 @@ OFILES=\
 	vsmprint.$O\
 	vsnprint.$O\
 
-HFILES=$ROOT/sys/include/libc.h\
+HFILES=/sys/include/libc.h\
 	fmtdef.h\
 
 UPDATE=\
@@ -42,5 +42,5 @@ UPDATE=\
 	$HFILES\
 	${OFILES:%.$O=%.c}
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 

sys/src/libc/mkfile

@@ -1,7 +1,7 @@
 # You need to setup this environment variable pointing to your plan9port path
 MKSHELL=$PLAN9/bin/rc
 
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
 PORTDIRS=9sys 9syscall fmt port
 DIRS=$PORTDIRS $CPUS

sys/src/libc/port/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libc.a
+LIB=/$objtype/lib/libc.a
 CFILES=\
 	_assert.c\
 	abs.c\
@@ -119,12 +119,12 @@ ALLOFILES=${CFILES:%.c=%.$O}
 # OFILES=	`{rc ./reduce $O $objtype $ALLOFILES}
 OFILES=${CFILES:%.c=%.$O}
 
-HFILES=$ROOT/sys/include/libc.h
+HFILES=/sys/include/libc.h
 
 UPDATE=mkfile\
 	$HFILES\
 	$CFILES\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
-profile.$O: $ROOT/sys/include/tos.h
+profile.$O: /sys/include/tos.h

sys/src/libcomplete/mkfile

@@ -1,10 +1,10 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libcomplete.a
+LIB=/$objtype/lib/libcomplete.a
 OFILES=\
 	complete.$O\
 
-HFILES=$ROOT/sys/include/complete.h
+HFILES=/sys/include/complete.h
 
 UPDATE=\
 	mkfile\
@@ -12,4 +12,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libcontrol/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libcontrol.a
+LIB=/$objtype/lib/libcontrol.a
 
 OFILES=\
 	box.$O\
@@ -20,10 +20,10 @@ OFILES=\
 	textbutton.$O\
 	textbutton3.$O\
 
-HFILES=$ROOT/sys/include/draw.h\
-	$ROOT/sys/include/mouse.h\
-	$ROOT/sys/include/keyboard.h\
-	$ROOT/sys/include/control.h\
+HFILES=/sys/include/draw.h\
+	/sys/include/mouse.h\
+	/sys/include/keyboard.h\
+	/sys/include/control.h\
 	group.h
 
 UPDATE=\
@@ -32,6 +32,6 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
 $OFILES: $HFILES

sys/src/libdisk/mkfile

@@ -1,12 +1,12 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
 OFILES=\
 	disk.$O\
 	proto.$O\
 	scsi.$O\
 
-HFILES=$ROOT/sys/include/disk.h
-LIB=$ROOT/$objtype/lib/libdisk.a
+HFILES=/sys/include/disk.h
+LIB=/$objtype/lib/libdisk.a
 
 UPDATE=\
 	mkfile\
@@ -14,7 +14,7 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
 $O.test: test.$O $LIB
 	$LD -o $target test.$O $LIB

sys/src/libdraw/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libdraw.a
+LIB=/$objtype/lib/libdraw.a
 
 OFILES=\
 	alloc.$O\
@@ -61,10 +61,10 @@ OFILES=\
 	writesubfont.$O\
 
 HFILES=\
-	$ROOT/sys/include/draw.h\
-	$ROOT/sys/include/event.h\
-	$ROOT/sys/include/mouse.h\
-	$ROOT/sys/include/keyboard.h
+	/sys/include/draw.h\
+	/sys/include/event.h\
+	/sys/include/mouse.h\
+	/sys/include/keyboard.h
 
 UPDATE=\
 	mkfile\
@@ -72,4 +72,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libflate/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libflate.a
+LIB=/$objtype/lib/libflate.a
 OFILES=\
 	deflate.$O\
 	deflatezlib.$O\
@@ -15,7 +15,7 @@ OFILES=\
 	adler.$O\
 
 HFILES=\
-	$ROOT/sys/include/flate.h\
+	/sys/include/flate.h\
 	zlib.h\
 
 UPDATE=\
@@ -24,4 +24,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libframe/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libframe.a
+LIB=/$objtype/lib/libframe.a
 OFILES=\
 	frbox.$O\
 	frdraw.$O\
@@ -18,4 +18,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libgeometry/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libgeometry.a
+LIB=/$objtype/lib/libgeometry.a
 OFILES=\
 	arith3.$O\
 	matrix.$O\
@@ -9,9 +9,9 @@ OFILES=\
 	transform.$O\
 	tstack.$O\
 
-HFILES=$ROOT/sys/include/geometry.h
+HFILES=/sys/include/geometry.h
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
 UPDATE=\
 	mkfile\

sys/src/libhtml/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libhtml.a
+LIB=/$objtype/lib/libhtml.a
 
 OFILES=\
 	build.$O\
@@ -9,7 +9,7 @@ OFILES=\
 	utils.$O\
 
 HFILES=\
-	$ROOT/sys/include/html.h\
+	/sys/include/html.h\
 	impl.h\
 
 UPDATE=\
@@ -18,4 +18,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libhttpd/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libhttpd.a
+LIB=/$objtype/lib/libhttpd.a
 OFILES=\
 	alloc.$O\
 	checkcontent.$O\
@@ -21,7 +21,7 @@ OFILES=\
 	urlunesc.$O\
 
 HFILES=\
-	$ROOT/sys/include/httpd.h\
+	/sys/include/httpd.h\
 	escape.h\
 
 UPDATE=\
@@ -30,4 +30,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/libip/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libip.a
+LIB=/$objtype/lib/libip.a
 OFILES=\
 	eipfmt.$O\
 	equivip.$O\
@@ -15,7 +15,7 @@ OFILES=\
 	ptclbsum.$O\
 
 HFILES=\
-	$ROOT/sys/include/ip.h
+	/sys/include/ip.h
 
 UPDATE=\
 	mkfile\
@@ -23,4 +23,4 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/386/%}\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib

sys/src/liblex/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libl.a
+LIB=/$objtype/lib/libl.a
 OFILES=\
 	allprint.$O\
 	main.$O\
@@ -14,5 +14,5 @@ UPDATE=\
 	${OFILES:%.$O=%.c}\
 	${LIB:/$objtype/%=/amd64/%}\
 
-CFLAGS=$CFLAGS -I$ROOT/sys/src/cmd/lex
-<$ROOT/sys/src/cmd/mksyslib
+CFLAGS=$CFLAGS -I/sys/src/cmd/lex
+</sys/src/cmd/mksyslib

sys/src/libmach/mkfile

@@ -1,6 +1,6 @@
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
-LIB=$ROOT/$objtype/lib/libmach.a
+LIB=/$objtype/lib/libmach.a
 FILES=\
 	executable\
 	map\
@@ -41,28 +41,28 @@ FILES=\
 	qobj\
 	vcodas\
 
-HFILES=$ROOT/sys/include/mach.h elf.h obj.h
+HFILES=/sys/include/mach.h elf.h obj.h
 
 CFILES=${FILES:%=%.c}
 
 OFILES=${FILES:%=%.$O}
 
 UPDATE=mkfile\
-	$ROOT/$objtype/lib/libmach.a\
+	/$objtype/lib/libmach.a\
 	$HFILES\
 	$CFILES\
 
-<$ROOT/sys/src/cmd/mksyslib
+</sys/src/cmd/mksyslib
 
-CFLAGS=$CFLAGS -I$ROOT/sys/src/cmd
+CFLAGS=$CFLAGS -I/sys/src/cmd
 
 68020obj.$O: 68020/2.out.h
-5obj.$O: $ROOT/sys/src/cmd/5c/5.out.h
-6obj.$O: $ROOT/sys/src/cmd/6c/6.out.h
+5obj.$O: /sys/src/cmd/5c/5.out.h
+6obj.$O: /sys/src/cmd/6c/6.out.h
 alphaobj.$O: alpha/7.out.h
-8obj.$O: $ROOT/sys/src/cmd/8c/8.out.h
+8obj.$O: /sys/src/cmd/8c/8.out.h
 9obj.$O: 9c/9.out.h
-kobj.$O: $ROOT/sys/src/cmd/kc/k.out.h
-qobj.$O: $ROOT/sys/src/cmd/qc/q.out.h
+kobj.$O: /sys/src/cmd/kc/k.out.h
+qobj.$O: /sys/src/cmd/qc/q.out.h
 sparc64obj.$O: sparc64/u.out.h
-vobj.$O: $ROOT/sys/src/cmd/vc/v.out.h
+vobj.$O: /sys/src/cmd/vc/v.out.h

sys/src/mkfile

@@ -1,10 +1,6 @@
-# Harcoding :(
-MKSHELL=$PLAN9/bin/rc
-# Rc doesn't know anything about bash environment variables, sigh!
-objtype=amd64 # :(
-ROOT=/home/elbing/source/plan9/harvey/plan9-gpl
+objtype=amd64
 
-<$ROOT/$objtype/mkfile
+</$objtype/mkfile
 
 LIBS=\
 	lib9p\

sys/src/mkfile.proto

@@ -2,9 +2,6 @@
 # common mkfile parameters shared by all architectures
 #
 
-# You need to setup this environment variable pointing to your plan9port path
-MKSHELL=$PLAN9/bin/rc
-
 # Provisional for cross compiling
 objtype=amd64
 
@@ -16,8 +13,7 @@ CFLAGS=-O0 -static -fplan9-extensions -ffreestanding -fno-builtin --sysroot=$ROO
 LEX=lex
 YACC=yacc
 
-# From $PLAN9 plan9port
-#MK=/bin/mk
+MK=/bin/mk
 
 # recursive mk will have these set from the parent
 # this is never what we want.  clear them
@@ -27,17 +23,17 @@ OFILES=
 HFILES=
 YFILES=
 
-INC_DIR=$ROOT/sys/include
-INCX86_64_DIR=$ROOT/$objtype/include
-CRT0=$ROOT/$objtype/lib/crt0.o
-LIB_DIR=$ROOT/$objtype/lib
+INC_DIR=/sys/include
+INCX86_64_DIR=/$objtype/include
+CRT0=/$objtype/lib/crt0.o
+LIB_DIR=/$objtype/lib
 
-APELIB=$ROOT/rc/bin/ape              # where helper programs go
+APELIB=/rc/bin/ape              # where helper programs go
 FAMILY=plan9
 AR=ar                            # manipulating libraries
 RANLIB=ranlib                    # for updating libraries
 
-INSTALL=$ROOT/$APELIB/install          # install script
+INSTALL=/$APELIB/install          # install script
 INSOWNER=()                     # default installation parameter
 INSGROUP=bin                    # default installation parameter
 INSMODE=775                     # default installation parameter