From d6d288d03560d7f086db45927490907898db19d9 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Tue, 7 May 2002 15:30:49 +0000
Subject: [PATCH] Install PROG before SCRIPTS and FILES, but make sure LINKS
 are still processed last.  This backs out part of the backout in previous
 revision.

Install the manpages before descending into SUBDIRs.
---
 share/mk/bsd.prog.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index ff4b0c1cbc7a..d90851a3fed7 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -104,7 +104,8 @@ _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
 .endfor
 
 .if !target(realinstall)
-realinstall:
+realinstall: _proginstall
+_proginstall:
 .if defined(PROG)
 .if defined(PROGNAME)
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
@@ -118,6 +119,8 @@ realinstall:
 	(cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \
 	    chown -h ${BINOWN}:${ORIGBINGRP} ${PROG})
 .endif
+
+realinstall:
 .if defined(LINKS) && !empty(LINKS)
 	@set ${LINKS}; \
 	while test $$# -ge 2; do \
@@ -197,11 +200,12 @@ _FILESINS_${file:T}: ${file}
 .endfor
 .endif
 
+.if !defined(NOMAN)
+realinstall: maninstall
+.endif
+
 install: afterinstall
 afterinstall: realinstall
-.if !defined(NOMAN)
-afterinstall: maninstall
-.endif
 .endif
 
 .if !target(lint)