20120305-2004

15 files changed, 15 insertions, 15 deletions

diff --git a/mkfiles/mkfile-Inferno-386 b/mkfiles/mkfile-Inferno-386
index f72ae7f7..85879f66 100644
--- a/mkfiles/mkfile-Inferno-386
+++ b/mkfiles/mkfile-Inferno-386
@@ -12,7 +12,7 @@ AS=		8a
 ASFLAGS=
 
 CC=		8c
-CFLAGS=		-wFVT -I$ROOT/Inferno/386/include -I$ROOT/include
+CFLAGS=		-wFVT -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		8l
diff --git a/mkfiles/mkfile-Inferno-68000 b/mkfiles/mkfile-Inferno-68000
index 8f8c6f46..0bddea56 100644
--- a/mkfiles/mkfile-Inferno-68000
+++ b/mkfiles/mkfile-Inferno-68000
@@ -12,7 +12,7 @@ AS=		1a
 ASFLAGS=
 
 CC=		1c
-CFLAGS=		-N -wFV -I$ROOT/Inferno/68000/include -I$ROOT/include
+CFLAGS=		-N -wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		1l
diff --git a/mkfiles/mkfile-Inferno-arm b/mkfiles/mkfile-Inferno-arm
index d865a096..50dcf2d8 100644
--- a/mkfiles/mkfile-Inferno-arm
+++ b/mkfiles/mkfile-Inferno-arm
@@ -12,7 +12,7 @@ AS=		5a
 ASFLAGS=
 
 CC=		5c
-CFLAGS=		-wFV -I$ROOT/Inferno/arm/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		5l
diff --git a/mkfiles/mkfile-Inferno-mips b/mkfiles/mkfile-Inferno-mips
index 6c17f4b0..56b834ee 100644
--- a/mkfiles/mkfile-Inferno-mips
+++ b/mkfiles/mkfile-Inferno-mips
@@ -12,7 +12,7 @@ AS=		va
 ASFLAGS=
 
 CC=		vc
-CFLAGS=		-wFV -I$ROOT/Inferno/mips/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		vl
diff --git a/mkfiles/mkfile-Inferno-power b/mkfiles/mkfile-Inferno-power
index e531ea3c..28d13279 100644
--- a/mkfiles/mkfile-Inferno-power
+++ b/mkfiles/mkfile-Inferno-power
@@ -12,7 +12,7 @@ AS=		qa
 ASFLAGS=
 
 CC=		qc
-CFLAGS=		-wFV -I$ROOT/Inferno/power/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		ql
diff --git a/mkfiles/mkfile-Inferno-sparc b/mkfiles/mkfile-Inferno-sparc
index 8470a169..2296e9f8 100644
--- a/mkfiles/mkfile-Inferno-sparc
+++ b/mkfiles/mkfile-Inferno-sparc
@@ -12,7 +12,7 @@ AS=		ka
 ASFLAGS=
 
 CC=		kc
-CFLAGS=		-wFV -I$ROOT/Inferno/sparc/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		kl
diff --git a/mkfiles/mkfile-Inferno-spim b/mkfiles/mkfile-Inferno-spim
index d380db33..c9105e1f 100644
--- a/mkfiles/mkfile-Inferno-spim
+++ b/mkfiles/mkfile-Inferno-spim
@@ -12,7 +12,7 @@ AS=		0a
 ASFLAGS=
 
 CC=		0c
-CFLAGS=		-w -I$ROOT/Inferno/spim/include -I$ROOT/include
+CFLAGS=		-w -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		0l
diff --git a/mkfiles/mkfile-Inferno-thumb b/mkfiles/mkfile-Inferno-thumb
index 6e0e402c..fdb7647f 100644
--- a/mkfiles/mkfile-Inferno-thumb
+++ b/mkfiles/mkfile-Inferno-thumb
@@ -12,7 +12,7 @@ AS=5a -t
 ASFLAGS=
 
 CC=		tc
-CFLAGS=		-wFV -I$ROOT/Inferno/arm/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/Inferno/include -I$ROOT/include
 ANSICPP= -p
 
 LD=5l
diff --git a/mkfiles/mkfile-Plan9-386 b/mkfiles/mkfile-Plan9-386
index 0ae1bf94..3efc6949 100644
--- a/mkfiles/mkfile-Plan9-386
+++ b/mkfiles/mkfile-Plan9-386
@@ -12,7 +12,7 @@ AS=		8a
 ASFLAGS=
 
 CC=		8c
-CFLAGS=		-wFVT -I$ROOT/Plan9/386/include -I$ROOT/include
+CFLAGS=		-wFVT -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		8l
diff --git a/mkfiles/mkfile-Plan9-68020 b/mkfiles/mkfile-Plan9-68020
index 49f97857..3ea42e7a 100644
--- a/mkfiles/mkfile-Plan9-68020
+++ b/mkfiles/mkfile-Plan9-68020
@@ -12,7 +12,7 @@ AS=		2a
 ASFLAGS=
 
 CC=		2c
-CFLAGS=		-wFV -I$ROOT/Plan9/68020/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		2l
diff --git a/mkfiles/mkfile-Plan9-amd64 b/mkfiles/mkfile-Plan9-amd64
index 1113e596..3a03f92a 100644
--- a/mkfiles/mkfile-Plan9-amd64
+++ b/mkfiles/mkfile-Plan9-amd64
@@ -12,7 +12,7 @@ AS=		6a
 ASFLAGS=
 
 CC=		6c
-CFLAGS=		-wFV -I$ROOT/Plan9/amd64/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		6l
diff --git a/mkfiles/mkfile-Plan9-arm b/mkfiles/mkfile-Plan9-arm
index 8e94e70c..2740c932 100644
--- a/mkfiles/mkfile-Plan9-arm
+++ b/mkfiles/mkfile-Plan9-arm
@@ -12,7 +12,7 @@ AS=		5a
 ASFLAGS=
 
 CC=		5c
-CFLAGS=		-wFV -I$ROOT/Plan9/arm/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		5l
diff --git a/mkfiles/mkfile-Plan9-mips b/mkfiles/mkfile-Plan9-mips
index b3920e20..ade23ef2 100644
--- a/mkfiles/mkfile-Plan9-mips
+++ b/mkfiles/mkfile-Plan9-mips
@@ -12,7 +12,7 @@ AS=		va
 ASFLAGS=
 
 CC=		vc
-CFLAGS=		-wFV -I$ROOT/Plan9/mips/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		vl
diff --git a/mkfiles/mkfile-Plan9-power b/mkfiles/mkfile-Plan9-power
index 72b95551..71c5793c 100644
--- a/mkfiles/mkfile-Plan9-power
+++ b/mkfiles/mkfile-Plan9-power
@@ -12,7 +12,7 @@ AS=		qa
 ASFLAGS=
 
 CC=		qc
-CFLAGS=		-wFV -I$ROOT/Plan9/power/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		ql
diff --git a/mkfiles/mkfile-Plan9-sparc b/mkfiles/mkfile-Plan9-sparc
index e485feb2..6b52c338 100644
--- a/mkfiles/mkfile-Plan9-sparc
+++ b/mkfiles/mkfile-Plan9-sparc
@@ -12,7 +12,7 @@ AS=		ka
 ASFLAGS=
 
 CC=		kc
-CFLAGS=		-wFV -I$ROOT/Plan9/sparc/include -I$ROOT/include
+CFLAGS=		-wFV -I$ROOT/Plan9/$OBJTYPE/include -I$ROOT/Plan9/include -I$ROOT/include
 ANSICPP= -p
 
 LD=		kl