This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / share / mk / bsd.subdir.mk

diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 81ba0ee..d5e35a1 100644 (file)
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -11,13 +11,15 @@ BINMODE?=   555
 _SUBDIRUSE: .USE
        @for entry in ${SUBDIR}; do \
                (if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
 _SUBDIRUSE: .USE
        @for entry in ${SUBDIR}; do \
                (if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \

-                       echo "===> $${entry}.${MACHINE}"; \
-                       cd ${.CURDIR}/$${entry}.${MACHINE}; \
+                       echo "===> ${DIRPRFX}$${entry}.${MACHINE}"; \
+                       edir=$${entry}.${MACHINE}; \
+                       cd ${.CURDIR}/$${edir}; \

                else \
                else \

-                       echo "===> $$entry"; \
-                       cd ${.CURDIR}/$${entry}; \
+                       echo "===> ${DIRPRFX}$$entry"; \
+                       edir=$${entry}; \
+                       cd ${.CURDIR}/$${edir}; \

                fi; \
                fi; \

-               ${MAKE} ${.TARGET:realinstall=install}); \
+               ${MAKE} ${.TARGET:realinstall=install} DIRPRFX=${DIRPRFX}$$edir/); \

        done
 
 ${SUBDIR}::
        done
 
 ${SUBDIR}::


@@ -44,6 +46,10 @@ cleandir: _SUBDIRUSE
 depend: _SUBDIRUSE
 .endif
 
 depend: _SUBDIRUSE
 .endif
 

+.if !target (maninstall)
+maninstall: _SUBDIRUSE
+.endif
+

 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall: