From 1c253ceb586c4519f42ce115954c4efab787f81a Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 23 Nov 2003 19:49:17 +0000
Subject: Annoying changes to work on Sun boxes.

---
 src/cmd/mkfile       |  2 +-
 src/cmd/rc/syn.y     |  2 +-
 src/cmd/venti/mkfile | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/cmd')

diff --git a/src/cmd/mkfile b/src/cmd/mkfile
index 72a2320a..b34a61b3 100644
--- a/src/cmd/mkfile
+++ b/src/cmd/mkfile
@@ -6,7 +6,7 @@ LDFLAGS=$LDFLAGS -lsec -lregexp9 -l9 -lbio -lfmt -lutf
 
 <$PLAN9/src/mkmany
 
-BUGGERED='CVS|oplumb|plumb|plumb2|mk|vac'
+BUGGERED='CVS|oplumb|plumb|plumb2|mk|vac|9term'
 DIRS=`ls -l |sed -n 's/^d.* //p' |egrep -v "$BUGGERED"`
 
 <$PLAN9/src/mkdirs
diff --git a/src/cmd/rc/syn.y b/src/cmd/rc/syn.y
index c7de3531..38a01036 100644
--- a/src/cmd/rc/syn.y
+++ b/src/cmd/rc/syn.y
@@ -7,7 +7,7 @@
 %left BANG SUBSHELL
 %left PIPE
 %left '^'
-%right '$' COUNT '"'
+%right '$' COUNT '\"'
 %left SUB
 %{
 #include "rc.h"
diff --git a/src/cmd/venti/mkfile b/src/cmd/venti/mkfile
index 48f2c60f..e899ef3f 100644
--- a/src/cmd/venti/mkfile
+++ b/src/cmd/venti/mkfile
@@ -71,16 +71,12 @@ it:V: all
 
 <$PLAN9/src/mkmany
 
+$SLIB: $LIBOFILES
+	ar rvc $SLIB $LIBOFILES
+
 # xml.c:D:	mkxml dat.h
 # 	./mkxml dat.h > xml.c
 
-$SLIB(%.$O):N: %.$O
-$SLIB:	${LIBOFILES:%=$SLIB(%)}
-	names=`echo $newprereq | sed -E 's/'$SLIB'\(([^)]+)\)/\1/g'`
-	# names = `{echo $newprereq |sed 's/ /\n/g' |sed -n 's/'$SLIB'\(([^)]+)\)/\1/gp'}
-	ar rvc $SLIB $names
-#	rm $names
-
 ainstall:V: ${TARG:%=%.ainstall}
 
 %.ainstall:V:	$O.%
-- 
cgit v1.2.3