commit d3a25066c942ac23e202629ac469726aa6527cdf
from: rsc <devnull@localhost>
date: Sun Jan 16 21:32:01 2005 UTC

tweaks

commit - 0215fd56dbd9823b392000729edbb81c46447cda
commit + d3a25066c942ac23e202629ac469726aa6527cdf
blob - ed00e3014cd5614c5e4bafd823e05d4734b0d8a4
blob + 39dec9d8c55e4bfa30eff397740f2fbed29d1ca7
--- unix/make/Makefile.BOT
+++ 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)
blob - 6a1e90143d871253d4645b630b5174c0bef8fec6
blob + ca1e6697ab6a37677dc1c39bb78c00b56e8ea1a0
--- unix/make/Makefile.CMD
+++ 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)
-
blob - f6abc8c1d978dea6e7f45e638b92fb2417741042
blob + c5a613de0898acfbd7af5e5758c836efd9ebbb10
--- unix/make/Makefile.TOP
+++ unix/make/Makefile.TOP
@@ -18,3 +18,5 @@ NUKEFILES=
 
 TGZFILES=
 
+CLEANFILES=
+
blob - 295e351280c6685b5e6ebd8f7b1678883e096c3e
blob + 00a0b6976ef0896ba1f6c97adc6d5106159eb638
--- unix/make/Makefile.bio
+++ 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)
blob - 85e9455f34e122fd74e1005ed5c6e78eb3aabec0
blob + 14657c670600382f7d74625e6735449034149363
--- unix/make/Makefile.fmt
+++ 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
blob - 2a06164dcd43926b8e9184845136b164ac466d4c
blob + a80ad19ef3b1e91dbac84e51761c47215a08c020
--- unix/make/Makefile.mk
+++ 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
 
blob - b098d3682b89ecab8bd6885aad0703786efda3e0
blob + 5729981c8e3e11bfa532580f8c22e4bbd5a9c6b7
--- unix/make/Makefile.regexp
+++ 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)
blob - 4d15d10038f9768dae8bb2c97ddaf93c75a7979d
blob + 10e7230957dac36841bc1e05a0f42536a7e09f4d
--- unix/make/Makefile.utf
+++ 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)
 
blob - 09cc3db0fa66cf06967d4088d8c161c7430b78b3
blob + b1eb25f51707d77230887c63b7e23f4ab290b6f3
--- unix/man/mk.1
+++ 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
blob - 6cf69e0a980d263ea2f616c7a5ba73dbcdd56489
blob + 918aff8aea036640bac6286ffdf3b62d5baf0524
--- unix/man/mkfile
+++ 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
blob - c801b6521f22e133bede264784653c67fd241282
blob + ee8563caeb8e990afea678b1345125918e89ffc5
--- unix/mkfile
+++ 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
blob - 5b5ebbea8a3dc6091b8013e0785b0ca20863abe9
blob + 5af2970dc9640aa4e8378cbe6b348bd4e7b4cacc
--- unix/mkfile.mk
+++ 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