9base

commit 8d32bc598c90490fc0a9243b2c0f723958be604c
parent 1c45d63ec3ac9a4a0e63129f1c7e587bff757dc3
Author: Anselm R Garbe <garbeam@gmail.com>
Date:   Thu, 27 Aug 2009 14:15:56 +0100

final preparation for 9base-4
Diffstat:
M
Makefile
 | 
7
+++----
M
lib9/Makefile
 | 
4
----
M
std.mk
 | 
8
++++----

3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,10 +1,9 @@
-# 9base - awk basename bc cal cat cleanname dc du echo grep mk rc sed seq sleep
-#         troff hoc sort tee test touch tr uniq from Plan 9
+# 9base - Plan 9 userland for Unix
 
 include config.mk
 
-SUBDIRS  = lib9 mk yacc awk basename bc dc du cal cat cleanname date echo grep ls \
-           hoc rc read sed seq sleep sort tee test touch tr troff uniq
+SUBDIRS  = lib9 yacc awk basename bc cal cat cleanname date dc du echo grep hoc ls \
+           mk rc read sed seq sleep sort tee test touch tr troff uniq
 
 all:
 	@echo 9base build options:
diff --git a/lib9/Makefile b/lib9/Makefile
@@ -203,12 +203,8 @@ all: ${LIB}
 	@echo built lib9
 
 install:
-	@mkdir -p ${DESTDIR}${MANPREFIX}/man7
-	@cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man7/regexp.7
 
 uninstall:
-	rm -f ${DESTDIR}${MANPREFIX}/man7/regexp.7
 
 ${LIB}: ${OFILES}
 	@echo AR ${TARG}
diff --git a/std.mk b/std.mk
@@ -1,7 +1,7 @@
 # std.mk - included by most Makefiles in subdirs
 
 OFILES    ?= ${TARG}.o
-MANFILES  ?= ${TARG}.1
+MANFILE   ?= ${TARG}.1
 
 include ../config.mk
 
@@ -16,12 +16,12 @@ install-default: ${TARG}
 	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
+	@cp -f ${MANFILE} ${DESTDIR}${MANPREFIX}/man1
+	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILE}
 
 uninstall: pre-uninstall
 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-	rm -f ${DESTDIR}${PREFIX}/man1/${MANFILES}
+	rm -f ${DESTDIR}${PREFIX}/man1/${MANFILE}
 
 .c.o:
 	@echo CC $*.c