diff options
| author | obache <obache> | 2011-08-30 11:19:51 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-08-30 11:19:51 +0000 |
| commit | 595a32189cf56e0f35ba1bc92bebe91b26c71ab4 (patch) | |
| tree | da6d6864ddf856700df20ceacefeda5976733973 /mk | |
| parent | 846d3a503192b08b69615f4a8a8b63ca9af0e289 (diff) | |
| download | pkgsrc-595a32189cf56e0f35ba1bc92bebe91b26c71ab4.tar.gz | |
escape `+' in DESTDIR for regex.
fixes PR#45245.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/plist/print-plist.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index 51b15ffa49f..09f76199019 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: print-plist.mk,v 1.18 2009/06/14 17:12:03 joerg Exp $ +# $NetBSD: print-plist.mk,v 1.19 2011/08/30 11:19:51 obache Exp $ ### ### Automatic PLIST generation @@ -148,7 +148,7 @@ print-PLIST: | ${_PRINT_PLIST_LIBTOOLIZE_FILTER} \ | ${SORT} \ | ${AWK} ' \ - { sub("${DESTDIR}${PREFIX}/\\./", ""); } \ + { sub("${DESTDIR:S|+|\\\\+|g}${PREFIX}/\\./", ""); } \ ${_PRINT_PLIST_AWK_IGNORE} { next; } \ ${PRINT_PLIST_AWK} \ ${_PRINT_PLIST_AWK_SUBST} \ @@ -177,9 +177,9 @@ print-PLIST: | ${SORT} -r \ | ${AWK} ' \ /emul\/linux\/proc/ { next; } \ - /${DESTDIR:S|/|\\/|g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \ + /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \ /${PKG_DBDIR:S|/|\\/|g}\// { next; } \ - { sub("${DESTDIR}${PREFIX}/\\\\./", ""); } \ + { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \ { sub("^${PKGINFODIR}/", "info/"); } \ { sub("^${PKGMANDIR}/", "man/"); } \ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \ |