diff options
| author | jlam <jlam> | 2005-05-21 01:55:53 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-21 01:55:53 +0000 |
| commit | 62edb5dc86651b11ed50d83d2133160ebfc8f277 (patch) | |
| tree | 4958b63ea1a818eaafcacd46e68dd0e195bc9538 | |
| parent | 18b31ba29484d44768dfd4dcc8bd7b565bdf6bda (diff) | |
| download | pkgsrc-62edb5dc86651b11ed50d83d2133160ebfc8f277.tar.gz | |
In computing _REPLACE_LOCALEDIR_PATTERNS_FIND_cmd, make sure the :sh
operator does not result in an empty string as make(1) doesn't like
them. Also, rewrite the variable substitution for the find(1) command
to be more readable, and get rid of the extra grep(1) in favor of
using :N.
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9a6783e1bc7..cfd928d41ac 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1673 2005/05/20 21:36:05 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1674 2005/05/21 01:55:53 jlam Exp $ # # This file is in the public domain. # @@ -1728,10 +1728,15 @@ _REPLACE_LOCALEDIR_PATTERNS+= [Mm]akefile.in* _REPLACE_LOCALEDIR_PATTERNS+= [Mm]akefile* . endif _REPLACE_LOCALEDIR_PATTERNS_FIND_cmd= \ - cd ${WRKSRC} && ${FIND} . \( ${_REPLACE_LOCALEDIR_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \) -print | ${SED} -e 's|^\./||' | ${GREP} -v '\.orig' | ${SORT} -u -REPLACE_LOCALEDIR?= # empty -_REPLACE_LOCALEDIR= ${REPLACE_LOCALEDIR} \ - ${_REPLACE_LOCALEDIR_PATTERNS_FIND_cmd:sh} + cd ${WRKSRC} && \ + ${ECHO} "__dummy-entry__" && \ + ${FIND} . \( ${_REPLACE_LOCALEDIR_PATTERNS:C/.*/-o -name "&"/g:S/-o//1} \) -print \ + | ${SED} -e 's|^\./||' \ + | ${SORT} -u +REPLACE_LOCALEDIR?= # empty +_REPLACE_LOCALEDIR= \ + ${REPLACE_LOCALEDIR} \ + ${_REPLACE_LOCALEDIR_PATTERNS_FIND_cmd:sh:N__dummy-entry__:N*.orig} _CONFIGURE_PREREQ+= subst-pkglocaledir . if empty(USE_PKGLOCALEDIR:M[nN][oO]) |