diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-18 15:27:25 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-18 15:27:25 +0000 |
| commit | 1ce1ab6ba34201ae924a3dcdbae397470774c2a9 (patch) | |
| tree | 088a107ae4eab3e466a573fcddd5b3d0a2c8a0e2 /Mk | |
| parent | c97d2b39753f321c174ff6f2af77d21dd4cbc56a (diff) | |
| download | ports-1ce1ab6ba34201ae924a3dcdbae397470774c2a9.tar.gz ports-1ce1ab6ba34201ae924a3dcdbae397470774c2a9.zip | |
Make make clean be recursive again.
PR: 213188
Submitted by: tijl
Exp-run by: antoine
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=424170
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/depends-list.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh index e6c6d6035e40..99175e2f3e70 100644 --- a/Mk/Scripts/depends-list.sh +++ b/Mk/Scripts/depends-list.sh @@ -21,6 +21,8 @@ while getopts "mrw" FLAG; do w) # Only list dependencies that have a WRKDIR. Used for # 'make clean-depends'. + # Without -r recurse when WRKDIR exists; with -r + # always recurse. requires_wrkdir=1 ;; *) @@ -80,13 +82,10 @@ check_dep() { # Grab any needed vars from the port. - if [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 1 ]; then + if [ ${requires_wrkdir} -eq 1 ]; then set -- $(${dp_MAKE} -C ${d} -VWRKDIR -V_UNIFIED_DEPENDS) wrkdir="$1" shift - elif [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 0 ]; then - set -- "$(${dp_MAKE} -C ${d} -VWRKDIR)" - wrkdir="$1" elif [ ${recursive} -eq 1 ]; then set -- $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS) fi @@ -97,7 +96,7 @@ check_dep() { show_dep=0 fi [ ${show_dep} -eq 1 ] && echo ${d} - if [ ${recursive} -eq 1 ]; then + if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 -a ${show_dep} -eq 1 ]; then check_dep $@ fi done |