aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/mkfile2
-rw-r--r--src/cmd/rc/syn.y2
-rw-r--r--src/cmd/venti/mkfile10
3 files changed, 5 insertions, 9 deletions
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.%