tweaks

12 files changed, 25 insertions, 30 deletions

diff --git a/unix/make/Makefile.BOT b/unix/make/Makefile.BOT
index ed00e301..39dec9d8 100644
--- a/unix/make/Makefile.BOT
+++ b/unix/make/Makefile.BOT
@@ -15,7 +15,7 @@ tgz:
 	rm -rf $(NAME)-$(VERSION)
 
 clean:
-	rm -f $(OFILES) $(LIB)
+	rm -f $(OFILES) $(LIB) $(CLEANFILES)
 
 nuke:
 	rm -f $(OFILES) *.tgz *.rpm $(NUKEFILES)
diff --git a/unix/make/Makefile.CMD b/unix/make/Makefile.CMD
index 6a1e9014..ca1e6697 100644
--- a/unix/make/Makefile.CMD
+++ b/unix/make/Makefile.CMD
@@ -2,7 +2,3 @@
 $(TARG): $(OFILES)
 	$(CC) -o $(TARG) $(OFILES) -L$(PREFIX)/lib -L../libutf -L../libfmt -L../libbio -L../libregexp -lregexp9 -lbio -lfmt -lutf
 
-
-clean:
-	rm -f $(OFILES) $(TARG)
-
diff --git a/unix/make/Makefile.TOP b/unix/make/Makefile.TOP
index f6abc8c1..c5a613de 100644
--- a/unix/make/Makefile.TOP
+++ b/unix/make/Makefile.TOP
@@ -18,3 +18,5 @@ NUKEFILES=
 
 TGZFILES=
 
+CLEANFILES=
+
diff --git a/unix/make/Makefile.bio b/unix/make/Makefile.bio
index 295e3512..00a0b697 100644
--- a/unix/make/Makefile.bio
+++ b/unix/make/Makefile.bio
@@ -28,9 +28,11 @@ HFILES=\
 all: $(LIB)
 
 install: $(LIB)
-	test -d $(PREFIX)/man/man3 || mkdir $(PREFIX)/man/man3
+	mkdir -p $(PREFIX)/man/man3
 	install -m 0644 bio.3 $(PREFIX)/man/man3/bio.3
+	mkdir -p $(PREFIX)/include
 	install -m 0644 bio.h $(PREFIX)/include
+	mkdir -p $(PREFIX)/lib
 	install -m 0644 $(LIB) $(PREFIX)/lib/$(LIB)
 
 bcat: bcat.$O $(LIB)
diff --git a/unix/make/Makefile.fmt b/unix/make/Makefile.fmt
index 85e9455f..14657c67 100644
--- a/unix/make/Makefile.fmt
+++ b/unix/make/Makefile.fmt
@@ -53,7 +53,9 @@ install: $(LIB)
 	test -d $(PREFIX)/man/man3 || mkdir $(PREFIX)/man/man3
 	install -m 0644 print.3 $(PREFIX)/man/man3/print.3
 	install -m 0644 fmtinstall.3 $(PREFIX)/man/man3/fmtinstall.3
+	mkdir -p $(PREFIX)/include
 	install -m 0644 fmt.h $(PREFIX)/include/fmt.h
+	mkdir -p $(PREFIX)/lib
 	install -m 0644 $(LIB) $(PREFIX)/lib/$(LIB)
 
 $(NAN).$O: nan.h
diff --git a/unix/make/Makefile.mk b/unix/make/Makefile.mk
index 2a06164d..a80ad19e 100644
--- a/unix/make/Makefile.mk
+++ b/unix/make/Makefile.mk
@@ -2,6 +2,7 @@ TARG=mk
 VERSION=2.0
 PORTPLACE=devel/mk
 NAME=mk
+CLEANFILES=mk mk.1a
 
 OFILES=\
 	arc.$O\
@@ -38,10 +39,11 @@ all: $(TARG)
 TGZFILES+=mk.pdf
 
 install: $(LIB)
-	test -d $(PREFIX)/man/man1 || mkdir $(PREFIX)/man/man1
-	test -d $(PREFIX)/doc || mkdir $(PREFIX)/doc
+	mkdir -p $(PREFIX)/bin
 	install -m 0755 mk $(PREFIX)/bin/mk
 	cat mk.1 | sed 's;DOCPREFIX;$(PREFIX);g' >mk.1a
+	mkdir -p $(PREFIX)/man/man1
 	install -m 0644 mk.1a $(PREFIX)/man/man1/mk.1
+	mkdir -p $(PREFIX)/doc
 	install -m 0644 mk.pdf $(PREFIX)/doc/mk.pdf
 
diff --git a/unix/make/Makefile.regexp b/unix/make/Makefile.regexp
index b098d368..5729981c 100644
--- a/unix/make/Makefile.regexp
+++ b/unix/make/Makefile.regexp
@@ -19,11 +19,12 @@ HFILES=\
 all: $(LIB)
 
 install: $(LIB)
-	test -d $(PREFIX)/man/man3 || mkdir $(PREFIX)/man/man3
-	test -d $(PREFIX)/man/man7 || mkdir $(PREFIX)/man/man7
+	mkdir -p $(PREFIX)/man/man3 $(PREFIX)/man/man7
 	install -m 0644 regexp9.3 $(PREFIX)/man/man3/regexp9.3
 	install -m 0644 regexp9.7 $(PREFIX)/man/man7/regexp9.7
+	mkdir -p $(PREFIX)/lib
 	install -m 0644 $(LIB) $(PREFIX)/lib/$(LIB)
+	mdir -p $(PREFIX)/include
 	install -m 0644 regexp9.h $(PREFIX)/include/regexp9.h
 
 test: test.$O $(LIB)
diff --git a/unix/make/Makefile.utf b/unix/make/Makefile.utf
index 4d15d100..10e72309 100644
--- a/unix/make/Makefile.utf
+++ b/unix/make/Makefile.utf
@@ -36,6 +36,8 @@ install: $(LIB)
 	install -c -m 0644 utf.7 $(PREFIX)/man/man7/utf.7
 	install -c -m 0644 rune.3 $(PREFIX)/man/man3/rune.3
 	install -c -m 0644 runestrcat.3 $(PREFIX)/man/man3/runestrcat.3
+	mkdir -p $(PREFIX)/include
 	install -c -m 0644 utf.h $(PREFIX)/include/utf.h
+	mkdir -p $(PREFIX)/lib
 	install -c -m 0644 $(LIB) $(PREFIX)/lib/$(LIB)
 
diff --git a/unix/man/mk.1 b/unix/man/mk.1
index 09cc3db0..b1eb25f5 100644
--- a/unix/man/mk.1
+++ b/unix/man/mk.1
@@ -659,6 +659,7 @@ A. Hume,
 .PP
 Andrew G. Hume and Bob Flandrena,
 ``Maintaining Files on Plan 9 with Mk''.
+.BR DOCPREFIX/doc/mk.pdf .
 .SH HISTORY
 Andrew Hume wrote
 .I mk
diff --git a/unix/man/mkfile b/unix/man/mkfile
index 6cf69e0a..918aff8a 100644
--- a/unix/man/mkfile
+++ b/unix/man/mkfile
@@ -1,17 +1,3 @@
-MAN=\
-	isalpharune.3\
-	rune.3\
-	runestrcat.3\
-	utf.7\
-	print.3\
-	fmtinstall.3\
-	quote.3\
-	fmtstrtod.3\
-	bio.3\
-	regexp9.3\
-	regexp9.7\
-	mk.1\
-
 HTML=\
 	isalpharune3.html\
 	rune3.html\
@@ -26,7 +12,7 @@ HTML=\
 	regexp97.html\
 	mk1.html\
 
-all:V: $MAN $HTML
+all:V: $HTML
 
 title='Ported from Plan 9'
 MKSHELL=$PLAN9/bin/rc
diff --git a/unix/mkfile b/unix/mkfile
index c801b652..ee8563ca 100644
--- a/unix/mkfile
+++ b/unix/mkfile
@@ -38,15 +38,15 @@ test-%:V:
 
 lib%.tgz:V:
 	mk new-$stem
-	tar cf - lib$stem |gzip >lib$stem.tgz
+	tar cf $target lib$stem
 
 libregexp9.tgz:V:
 	mk new-regexp
-	tar cf - libregexp | gzip >libregexp9.tgz
+	tar cf $target libregexp
 
 mk.tgz:V:
 	mk new-mk
-	tar cf - mk | gzip >mk.tgz
+	tar cf $target mk
 
 mk-with-libs.tgz:V:
 	mk new-utf 
@@ -59,12 +59,12 @@ mk-with-libs.tgz:V:
 	mv libutf libfmt libbio libregexp mk zot
 	mv zot mk
 	cp Makefile mk/Makefile
-	tar cf - mk | gzip >$target
+	tar cf $target mk
 	rm -r mk
 
 tgz:V: libutf.tgz libfmt.tgz libregexp9.tgz libbio.tgz mk.tgz mk-with-libs.tgz
 
 push:
 	rsync -e ssh -t *.tgz swtch:www/swtch.com/plan9port/unix
-	ssh swtch rm www/swtch.com/plan9port/unix/*.sha1 \
+	ssh swtch rm -f www/swtch.com/plan9port/unix/*.sha1 \
 		www/swtch.com/plan9port/unix/*.md5
diff --git a/unix/mkfile.mk b/unix/mkfile.mk
index 5b5ebbea..5af2970d 100644
--- a/unix/mkfile.mk
+++ b/unix/mkfile.mk
@@ -8,6 +8,7 @@ TARG=\
 	mk.h\
 	sys.h\
 	fns.h\
+	mk.pdf\
 	`{9 ls -p $PLAN9/src/cmd/mk/*.c}\
 
 WHAT=mk