diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index db25e5e64a1..c90c34e4983 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.491 2000/06/28 16:39:23 dmcmahill Exp $ \ +# $NetBSD: bsd.pkg.mk,v 1.492 2000/06/28 17:35:53 dmcmahill Exp $ \ # # This file is in the public domain. # @@ -1999,7 +1999,7 @@ pre-clean: .if !target(clean) clean: pre-clean -.if (${CLEANDEPENDS} != "NO") +.if (${CLEANDEPENDS} != "NO") && (defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS)) ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} clean-depends .endif @${ECHO_MSG} "${_PKGSRC_IN}> Cleaning for ${PKGNAME}" @@ -2027,6 +2027,7 @@ clean: pre-clean .if !target(clean-depends) clean-depends: +.if defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS) ${_PKG_SILENT}${_PKG_DEBUG} \ for i in `${MAKE} ${MAKEFLAGS} CLEAN_DEPENDS_LIST_TOP=YES clean-depends-list | ${SED} -e 's;\.\./[^ ]*; ;g' | ${TR} -s "[:space:]" "\n" | sort -u` ;\ do \ @@ -2034,6 +2035,7 @@ clean-depends: ${MAKE} ${MAKEFLAGS} CLEANDEPENDS=NO clean; \ done .endif +.endif # The clean-depends-list target will produce a list of all @@ -2051,11 +2053,12 @@ clean-depends: .if !target(clean-depends-list) clean-depends-list: +.if defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS) @for dir in `${ECHO} ${BUILD_DEPENDS:C/^[^:]*://:C/:.*//} \ ${DEPENDS:C/^[^:]*://:C/:.*//} \ ${RUN_DEPENDS:C/^[^:]*://:C/:.*//} | \ ${TR} '\040' '\012' `; do \ - case "$$CLEAN_DEPENDS_LIST_SEEN" in \ + case "$$CLEAN_DEPENDS_LIST_SEEN" in \ *" "$$dir" "*) ;; \ *) \ CLEAN_DEPENDS_LIST_SEEN=" $$dir `cd ${.CURDIR} ; cd $$dir && ${MAKE} ${MAKEFLAGS} CLEAN_DEPENDS_LIST_SEEN="$$CLEAN_DEPENDS_LIST_SEEN" CLEAN_DEPENDS_LIST_TOP=NO clean-depends-list)`";\ @@ -2067,6 +2070,13 @@ clean-depends-list: else \ echo " $$CLEAN_DEPENDS_LIST_SEEN"; \ fi +.else + @if [ "${CLEAN_DEPENDS_LIST_TOP}" != "YES" ]; then \ + echo " ${PKGPATH} $$CLEAN_DEPENDS_LIST_SEEN"; \ + else \ + echo " $$CLEAN_DEPENDS_LIST_SEEN"; \ + fi +.endif .endif .if !target(pre-distclean) @@ -2790,7 +2800,7 @@ COMMON_DIRS!= ${AWK} 'BEGIN { \ .if !target(print-PLIST) print-PLIST: - @${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.491 2000/06/28 16:39:23 dmcmahill Exp $$' + @${ECHO} '@comment $$NetBSD: bsd.pkg.mk,v 1.492 2000/06/28 17:35:53 dmcmahill Exp $$' @${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \ | ${SED} s@${PREFIX}/./@@ \ | sort \ |