diff options
| author | tv <tv@pkgsrc.org> | 2004-10-16 22:37:29 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-16 22:37:29 +0000 |
| commit | b271937c8b2ea60e779b68ead7f091bbc98b5731 (patch) | |
| tree | 75435a4f64d56a927904d9489179b0d13e4590a9 /mk | |
| parent | 283a185679ab13e45cb1d9cc36c327daec205370 (diff) | |
| download | pkgsrc-b271937c8b2ea60e779b68ead7f091bbc98b5731.tar.gz | |
Propagate $ECHO, $GREP, $SORT to print-la-libnames; fixes this on IRIX.
Noted by Georg Schwarz <geos@epost.de>.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b100a73e017..9474467c151 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1519 2004/10/13 18:42:19 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1520 2004/10/16 22:37:29 tv Exp $ # # This file is in the public domain. # @@ -3466,7 +3466,7 @@ ${DDIR}: ${DLIST} ${DLIST}: ${WRKDIR} ${_PKG_SILENT}${_PKG_DEBUG} \ { ${PKG_DELETE} -n "${PKGWILDCARD}" 2>&1 | \ - grep '^ ' | \ + ${GREP} '^ ' | \ ${AWK} '{ l[NR]=$$0 } END { for (i=NR;i>0;--i) print l[i] }' \ || ${TRUE}; } > ${DLIST} @@ -4485,7 +4485,8 @@ _PRINT_PLIST_FILES_CMD= \ ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} \! -type d -print _PRINT_PLIST_DIRS_CMD= \ ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print -_PRINT_LA_LIBNAMES= ${.CURDIR}/../../mk/scripts/print-la-libnames +_PRINT_LA_LIBNAMES= ${SETENV} ECHO=${ECHO:Q} GREP=${GREP:Q} SORT=${SORT:Q} \ + ${SH} ${.CURDIR}/../../mk/scripts/print-la-libnames _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ ( \ @@ -4499,7 +4500,7 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ while read file; do \ case $$file in \ *.la) \ - ${SH} ${_PRINT_LA_LIBNAMES} $$file >> $$libslist; \ + ${_PRINT_LA_LIBNAMES} $$file >> $$libslist; \ ;; \ esac; \ ${ECHO} "$$file"; \ @@ -4960,7 +4961,7 @@ _PLIST_AWK_LIBTOOL?= # empty .else _PLIST_AWK_LIBTOOL?= \ /^[^@].*\.la$$/ { \ - system("cd ${PREFIX} && ${SH} ${_PRINT_LA_LIBNAMES} " $$0) \ + system("cd ${PREFIX} && ${_PRINT_LA_LIBNAMES} " $$0) \ } .endif |