20080723-2037

24 files changed, 22 insertions, 23 deletions

diff --git a/mkfile b/mkfile
index e43fc116..244d2a7e 100644
--- a/mkfile
+++ b/mkfile
@@ -12,10 +12,9 @@ EMUDIRS=\
 	libmp\
 	libsec\
 	libmath\
-	utils/yacc\
+	utils/iyacc\
 	limbo\
 	libinterp\
-	libkeyring\
 	libdraw\
 	libprefab\
 	libtk\
diff --git a/mkfiles/mkfile-FreeBSD-386 b/mkfiles/mkfile-FreeBSD-386
index 8ac7d34b..4b447fee 100644
--- a/mkfiles/mkfile-FreeBSD-386
+++ b/mkfiles/mkfile-FreeBSD-386
@@ -27,5 +27,5 @@ LDFLAGS=	-L/usr/openwin/lib\
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Hp-s800 b/mkfiles/mkfile-Hp-s800
index d4d6c602..e8a1f35b 100644
--- a/mkfiles/mkfile-Hp-s800
+++ b/mkfiles/mkfile-Hp-s800
@@ -29,5 +29,5 @@ LDFLAGS=	-s -L/usr/openwin/lib
 
 SYSLIBS=	-lm -lX11 -lcma
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Irix-mips b/mkfiles/mkfile-Irix-mips
index 3abeaaa4..4adcb3a1 100644
--- a/mkfiles/mkfile-Irix-mips
+++ b/mkfiles/mkfile-Irix-mips
@@ -26,5 +26,5 @@ LDFLAGS=
 
 SYSLIBS=	-lfpe
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Linux-386 b/mkfiles/mkfile-Linux-386
index e772df87..b6a55b56 100644
--- a/mkfiles/mkfile-Linux-386
+++ b/mkfiles/mkfile-Linux-386
@@ -26,5 +26,5 @@ LDFLAGS=	-L/usr/openwin/lib\
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Linux-arm b/mkfiles/mkfile-Linux-arm
index 709cb3fc..6c26a8e3 100644
--- a/mkfiles/mkfile-Linux-arm
+++ b/mkfiles/mkfile-Linux-arm
@@ -23,5 +23,5 @@ LDFLAGS=
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-MacOSX-386 b/mkfiles/mkfile-MacOSX-386
index 5aab0869..2101fe3a 100644
--- a/mkfiles/mkfile-MacOSX-386
+++ b/mkfiles/mkfile-MacOSX-386
@@ -36,6 +36,6 @@ LDFLAGS=\
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
 
diff --git a/mkfiles/mkfile-MacOSX-power b/mkfiles/mkfile-MacOSX-power
index de1b29db..2335096a 100644
--- a/mkfiles/mkfile-MacOSX-power
+++ b/mkfiles/mkfile-MacOSX-power
@@ -28,5 +28,5 @@ LDFLAGS= -multiply_defined suppress
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-NetBSD-386 b/mkfiles/mkfile-NetBSD-386
index 6c6c7f52..b99f91a6 100644
--- a/mkfiles/mkfile-NetBSD-386
+++ b/mkfiles/mkfile-NetBSD-386
@@ -25,5 +25,5 @@ LDFLAGS=	-L/usr/X11R6/lib -R/usr/X11R6/lib
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Nt-386 b/mkfiles/mkfile-Nt-386
index a69d94de..7fa9bddd 100644
--- a/mkfiles/mkfile-Nt-386
+++ b/mkfiles/mkfile-Nt-386
@@ -37,5 +37,5 @@ LDFLAGS=	$LDEBUG -nologo -incremental:no -map
 
 SYSLIBS=	binmode.obj
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-OpenBSD-386 b/mkfiles/mkfile-OpenBSD-386
index fcbc45b2..952cdcfa 100644
--- a/mkfiles/mkfile-OpenBSD-386
+++ b/mkfiles/mkfile-OpenBSD-386
@@ -26,5 +26,5 @@ LDFLAGS=	-L/usr/X11R6/lib
 
 SYSLIBS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Solaris-386 b/mkfiles/mkfile-Solaris-386
index 16254d84..e5f29df2 100644
--- a/mkfiles/mkfile-Solaris-386
+++ b/mkfiles/mkfile-Solaris-386
@@ -32,5 +32,5 @@ LDFLAGS=	$LDFLAGS\
 SYSLIBS=
 EMULIBS=	-lnsl -lsocket -lX11 -lm -lposix4
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-Solaris-sparc b/mkfiles/mkfile-Solaris-sparc
index eecc278e..d51570e0 100644
--- a/mkfiles/mkfile-Solaris-sparc
+++ b/mkfiles/mkfile-Solaris-sparc
@@ -8,7 +8,7 @@ OS=		o
 AR=		ar
 ARFLAGS=	cvru
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
 
 AS=             gcc
diff --git a/mkfiles/mkfile-Unixware-386 b/mkfiles/mkfile-Unixware-386
index b92d16b5..3806d786 100644
--- a/mkfiles/mkfile-Unixware-386
+++ b/mkfiles/mkfile-Unixware-386
@@ -36,5 +36,5 @@ LDSYSLIBS=	-lm -lX11
 
 RANLIB=		true
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-386 b/mkfiles/mkfile-os-386
index f65d0e4a..648cabe3 100644
--- a/mkfiles/mkfile-os-386
+++ b/mkfiles/mkfile-os-386
@@ -20,5 +20,5 @@ ANSICPP= -p
 LD=		8l
 LDFLAGS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-arm b/mkfiles/mkfile-os-arm
index c3dbf830..9e3829dc 100644
--- a/mkfiles/mkfile-os-arm
+++ b/mkfiles/mkfile-os-arm
@@ -22,5 +22,5 @@ LDFLAGS=
 
 SYSLIBS=	#-lc
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-power b/mkfiles/mkfile-os-power
index 7d99118b..fcfe6940 100644
--- a/mkfiles/mkfile-os-power
+++ b/mkfiles/mkfile-os-power
@@ -20,5 +20,5 @@ ANSICPP= -p
 LD=		ql
 LDFLAGS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-sparc b/mkfiles/mkfile-os-sparc
index 5ca4c7c8..1e26fa17 100644
--- a/mkfiles/mkfile-os-sparc
+++ b/mkfiles/mkfile-os-sparc
@@ -20,5 +20,5 @@ ANSICPP= -p
 LD=		kl
 LDFLAGS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-spim b/mkfiles/mkfile-os-spim
index 81052075..738fa006 100644
--- a/mkfiles/mkfile-os-spim
+++ b/mkfiles/mkfile-os-spim
@@ -20,5 +20,5 @@ ANSICPP= -p
 LD=		0l
 LDFLAGS=
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/mkfiles/mkfile-os-thumb b/mkfiles/mkfile-os-thumb
index 605f0d56..afe0cb6f 100644
--- a/mkfiles/mkfile-os-thumb
+++ b/mkfiles/mkfile-os-thumb
@@ -22,5 +22,5 @@ LDFLAGS=
 
 SYSLIBS=	#-lc
 
-YACC=		yacc
+YACC=		iyacc
 YFLAGS=		-d
diff --git a/utils/yacc/mkfile b/utils/iyacc/mkfile
index 05e2709e..c24612ca 100644
--- a/utils/yacc/mkfile
+++ b/utils/iyacc/mkfile
@@ -1,6 +1,6 @@
 <../../mkconfig
 
-TARG=yacc
+TARG=iyacc
 
 OFILES=	yacc.$O\
 
diff --git a/utils/yacc/yacc.c b/utils/iyacc/yacc.c
index 0a6fdda0..0a6fdda0 100644
--- a/utils/yacc/yacc.c
+++ b/utils/iyacc/yacc.c
diff --git a/utils/yacc/yaccpar b/utils/iyacc/yaccpar
index 79a8d4e0..79a8d4e0 100644
--- a/utils/yacc/yaccpar
+++ b/utils/iyacc/yaccpar
diff --git a/utils/mkfile b/utils/mkfile
index cc67410d..bf6be6eb 100644
--- a/utils/mkfile
+++ b/utils/mkfile
@@ -43,7 +43,7 @@ ALWAYS=\
 #	Utils we build on Posix and Nt, which already exist on Plan 9.
 #
 NOTPLAN9=\
-	yacc\
+	iyacc\
 	8a\
 	8c\
 	8l\