diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-10-01 22:53:27 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-10-01 22:53:27 +0000 |
| commit | 5bab73677e42ba68b0982b79870435b2bcfe4d52 (patch) | |
| tree | 36e2ec06f2a60bd138be3d2a6c47920b6b64a42c /Makefile.inc1 | |
| parent | 0f49c96cfc484c26d9153727b7d929d1e353993e (diff) | |
| download | src-5bab73677e42ba68b0982b79870435b2bcfe4d52.tar.gz src-5bab73677e42ba68b0982b79870435b2bcfe4d52.zip | |
Revert-and-redo r255955: the sort -r should be added to delete-old-dirs.
Approved by: re (gjb)
Notes
Notes:
svn path=/head/; revision=255981
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5fed30e057ff..ac10c2b1412d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1673,7 +1673,7 @@ delete-old-files: # the Makefile parser segfault. @exec 3<&0; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | sort -r | \ + -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ @@ -1738,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ |