diff options
| author | seb <seb> | 2003-08-12 15:51:29 +0000 |
|---|---|---|
| committer | seb <seb> | 2003-08-12 15:51:29 +0000 |
| commit | da356d9419d18796d8d63fbcf91f92c5e1294249 (patch) | |
| tree | deb10e84acf317bcf6658c6b5e454ff07b9a4830 /mk | |
| parent | 731dd93284756a113663577d2eb9a8ecaf9a4a4c (diff) | |
| download | pkgsrc-da356d9419d18796d8d63fbcf91f92c5e1294249.tar.gz | |
print-PLIST target change:
Make COMMON_DIRS generating an awk script instead of sed expressions hence
use awk instead of sed to deal with the mtree file.
This get ride of the annoying 'sed: Too many commands' message making
print-PLIST unusable with Solaris' seds.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 070c9a020d2..b74881ce342 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1236 2003/08/12 14:55:42 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1237 2003/08/12 15:51:29 seb Exp $ # # This file is in the public domain. # @@ -4222,12 +4222,13 @@ COMMON_DIRS!= ${AWK} 'BEGIN { \ if ( i == 0 ){ \ cwd = $$1 ; \ } else { \ - cwd = cwd "\\\\/" $$1 ; \ + cwd = cwd "\\/" $$1 ; \ } \ - print "-e \"/^" cwd "$$$$/d\""; \ + print "/^" cwd "$$$$/ { next; }"; \ i=i+1 ; \ } \ } \ + END { print "{ print $$$$0; }"; } \ ' <${MTREE_FILE} .endif @@ -4284,7 +4285,7 @@ print-PLIST: | ${SED} \ -e 's@${PREFIX}/./@@' \ -e '/^${PREFIX:S/\//\\\//g}\/.$$/d' \ - | ${SORT} -r | ${SED} ${COMMON_DIRS}` ; \ + | ${SORT} -r | ${AWK} '${COMMON_DIRS}'` ; \ do \ if [ `${LS} -la ${PREFIX}/$$i | ${WC} -l` = 3 ]; then \ ${ECHO} @exec \$${MKDIR} %D/$$i ; \ |