 |
tfix up extraction procedures - plan9port - [fork] Plan 9 from user space |
 |
git clone git://src.adamsgaard.dk/plan9port |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 1b7f98fb307ba8f3271a5051f05395ac99056b26 |
|
parent e5d47e6e15c72b816315e520a3b7756babf9deb2 |
|
Author: rsc <devnull@localhost> |
|
Date: Tue, 28 Dec 2004 23:27:43 +0000 |
|
|
|
fix up extraction procedures |
|
|
|
Diffstat: |
|
M unix/make/Makefile.regexp | 1 - |
|
M unix/make/Makefile.utf | 2 +- |
|
M unix/mkfile | 18 +++++++++++++++--- |
|
M unix/mkfile.fmt | 8 ++------ |
|
M unix/mkfile.mk | 2 +- |
|
M unix/mkfile.regexp | 9 ++++++++- |
|
M unix/mkfile.utf | 5 +++-- |
|
|
|
7 files changed, 30 insertions(+), 15 deletions(-) |
|
--- |
|
diff --git a/unix/make/Makefile.regexp b/unix/make/Makefile.regexp |
|
t@@ -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 |
|
t@@ -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 |
|
t@@ -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;; |
|
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 ] |
|
t@@ -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 |
|
t@@ -8,8 +8,9 @@ TARG=\ |
|
fmt.h\ |
|
fmtdef.h\ |
|
nan.h\ |
|
- print.3\ |
|
+ plan9.h\ |
|
fmtinstall.3\ |
|
+ print.3\ |
|
|
|
all:V: $TARG |
|
|
|
t@@ -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 |
|
t@@ -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 |
|
t@@ -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 |
|
|
|
t@@ -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 |
|
t@@ -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 |
|
|
|
t@@ -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 |
|
