diff options
| -rw-r--r-- | unix/make/Makefile.regexp | 1 | ||||
| -rw-r--r-- | unix/make/Makefile.utf | 2 | ||||
| -rw-r--r-- | unix/mkfile | 18 | ||||
| -rw-r--r-- | unix/mkfile.fmt | 8 | ||||
| -rw-r--r-- | unix/mkfile.mk | 2 | ||||
| -rw-r--r-- | unix/mkfile.regexp | 9 | ||||
| -rw-r--r-- | unix/mkfile.utf | 5 |
7 files changed, 30 insertions, 15 deletions
diff --git a/unix/make/Makefile.regexp b/unix/make/Makefile.regexp index ec528bd4..b098d368 100644 --- a/unix/make/Makefile.regexp +++ b/unix/make/Makefile.regexp @@ -11,7 +11,6 @@ OFILES=\ regaux.$O\ rregexec.$O\ rregsub.$O\ - rregaux.$O\ HFILES=\ regexp9.h\ diff --git a/unix/make/Makefile.utf b/unix/make/Makefile.utf index 9c142d44..4d15d100 100644 --- a/unix/make/Makefile.utf +++ b/unix/make/Makefile.utf @@ -31,7 +31,7 @@ HFILES=\ all: $(LIB) install: $(LIB) - test -d $(PREFIX)/man/man3 || mkdir $(PREFIX)/man/man3 + mkdir -p $(PREFIX)/man/man3 $(PREFIX)/man/man7 install -c -m 0644 isalpharune.3 $(PREFIX)/man/man3/isalpharune.3 install -c -m 0644 utf.7 $(PREFIX)/man/man7/utf.7 install -c -m 0644 rune.3 $(PREFIX)/man/man3/rune.3 diff --git a/unix/mkfile b/unix/mkfile index 4f63a77a..58b86e54 100644 --- a/unix/mkfile +++ b/unix/mkfile @@ -4,10 +4,12 @@ bio fmt mk regexp utf:V: regexp) t=libregexp ;; *) t=lib$target ;; esac - mkdir $t || true - rm $t/* || true + # + mkdir -p $t + rm -f $t/* || true cd $t mk -f ../mkfile.$target + # case $target in bio) d=$PLAN9/src/$t;; regexp) d=$PLAN9/src/$t;; @@ -15,6 +17,7 @@ bio fmt mk regexp utf:V: utf) d=$PLAN9/src/lib9/$target ;; mk) d=$PLAN9/src/cmd/mk ;; esac + # for i in `ls -p $d/*.c` do if [ ! -f $i ] @@ -34,7 +37,16 @@ bio fmt mk regexp utf:V: rm $t/* || true cd $t mk -f ../mkfile.$target - + +%.install:V: + mk $stem + case $stem in + mk) t=mk ;; + regexp) t=libregexp ;; + *) t=lib$stem ;; + esac + (cd $t; make install) + lib%.tgz: mk $stem tar cf - lib$stem |gzip >lib$stem.tgz diff --git a/unix/mkfile.fmt b/unix/mkfile.fmt index d970a246..36d4e8df 100644 --- a/unix/mkfile.fmt +++ b/unix/mkfile.fmt @@ -8,8 +8,9 @@ TARG=\ fmt.h\ fmtdef.h\ nan.h\ - print.3\ + plan9.h\ fmtinstall.3\ + print.3\ all:V: $TARG @@ -40,8 +41,3 @@ README: ../README NOTICE: ../NOTICE.fmt cp $prereq $target -fmt.h: ../fmt.h - cp $prereq $target - -fmt.c: $PLAN9/src/lib9/fmt/fmt.c - cat $prereq | sed "/'u',.*__flagfmt/ s/__flagfmt/__ifmt/" >$target diff --git a/unix/mkfile.mk b/unix/mkfile.mk index 09d064d7..17fd970d 100644 --- a/unix/mkfile.mk +++ b/unix/mkfile.mk @@ -39,5 +39,5 @@ README: ../README NOTICE: ../NOTICE.mk cp $prereq $target -sys.h: $PLAN9/src/cmd/mk/sys.h.std +sys.h: $PLAN9/src/cmd/mk/sys.std.h cp $prereq $target diff --git a/unix/mkfile.regexp b/unix/mkfile.regexp index de813087..86834227 100644 --- a/unix/mkfile.regexp +++ b/unix/mkfile.regexp @@ -28,6 +28,12 @@ all:V: $TARG %: $PLAN9/man/man7/% cp $prereq $target +regexp9.3: $PLAN9/man/man3/regexp.3 + cp $prereq $target + +regexp9.7: $PLAN9/man/man7/regexp.7 + cp $prereq $target + %: ../make/% cp $prereq $target @@ -40,5 +46,6 @@ README: ../README NOTICE: ../NOTICE.regexp cp $prereq $target -lib9.h: $PLAN9/src/libregexp/lib9.h +lib9.h: $PLAN9/src/libregexp/lib9.std.h cp $prereq $target + diff --git a/unix/mkfile.utf b/unix/mkfile.utf index bb8e438f..23ed764e 100644 --- a/unix/mkfile.utf +++ b/unix/mkfile.utf @@ -5,12 +5,13 @@ TARG=\ README\ Makefile\ `{ls -p $PLAN9/src/lib9/utf/*.c}\ + plan9.h\ utf.h\ utfdef.h\ isalpharune.3\ - utf.7\ rune.3\ runestrcat.3\ + utf.7\ all:V: $TARG @@ -41,6 +42,6 @@ README: ../README NOTICE: ../NOTICE.utf cp $prereq $target -utf.h: ../utf.h +utf.h: $PLAN9/include/utf.h cp $prereq $target |