[canopy-httpd] r1114 committed - remove the target `maninstall' from the prog.mk chain, so that the tar...

[codesite...@google.com]

Revision: 1114
Author: phrakt
Date: Mon Dec 6 19:21:03 2010
Log: remove the target `maninstall' from the prog.mk chain, so that the
target
itself doesn't attempt to install the program, and make `maninstall' depend
on MANALL so that manual cat pages are created if needed

http://code.google.com/p/canopy-httpd/source/detail?r=1114

Modified:
/trunk/src/share/mk/man.mk
/trunk/src/share/mk/prog.mk

=======================================
--- /trunk/src/share/mk/man.mk Sun Dec 5 16:30:46 2010
+++ /trunk/src/share/mk/man.mk Mon Dec 6 19:21:03 2010
@@ -61,7 +61,7 @@
chmod ${MANMODE} $$instpage
.endif

-maninstall:
+maninstall: ${MANALL}
.if defined(MANALL)
@for page in ${MANALL}; do \
set -- ${MANSUBDIR}; \
=======================================
--- /trunk/src/share/mk/prog.mk Mon Apr 12 14:15:43 2010
+++ /trunk/src/share/mk/prog.mk Mon Dec 6 19:21:03 2010
@@ -76,11 +76,13 @@
cleandir: _SUBDIRUSE clean

.if !target(install)
+
.if !target(beforeinstall)
beforeinstall:
.endif
+
.if !target(afterinstall)
-afterinstall:
+afterinstall: maninstall
.endif

.if !target(realinstall)
@@ -91,7 +93,7 @@
.endif
.endif

-install: ${PROG} maninstall _SUBDIRUSE
+install: ${PROG} afterinstall _SUBDIRUSE
.if defined(LINKS) && !empty(LINKS)
. for lnk file in ${LINKS}
@l=${DESTDIR}${lnk}; \
@@ -101,7 +103,6 @@
. endfor
.endif

-maninstall: afterinstall
afterinstall: realinstall
realinstall: beforeinstall
.endif