diff options
| author | jperkin <jperkin> | 2013-07-05 15:31:54 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-07-05 15:31:54 +0000 |
| commit | b6aa97d3d1ff787e2977a08f8a81a11eae6db2ab (patch) | |
| tree | 93add88cebd39eaa11687c7cca2525219038e82a | |
| parent | af31c04131dae9d657d3b5b701919aabb440aa9d (diff) | |
| download | pkgsrc-b6aa97d3d1ff787e2977a08f8a81a11eae6db2ab.tar.gz | |
Fix print-PLIST with a custom PKGGNUDIR.
| -rw-r--r-- | mk/plist/print-plist.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index eb1e1bbfd82..da8ed6d8f2a 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: print-plist.mk,v 1.23 2013/02/20 09:19:08 wiz Exp $ +# $NetBSD: print-plist.mk,v 1.24 2013/07/05 15:31:54 jperkin Exp $ ### ### Automatic PLIST generation @@ -26,7 +26,7 @@ _PRINT_PLIST_AWK_SUBST+= \ gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}"); \ gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\ gsub(/^${PKGLOCALEDIR}\/locale/, "share/locale"); \ - gsub("^${PKGGNUDIR}", "gnu/"); \ + gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/"); \ gsub("^${PKGINFODIR}/", "info/"); \ gsub("^${PKGMANDIR}/", "man/"); _PRINT_PLIST_AWK_SUBST+=} @@ -175,7 +175,6 @@ print-PLIST: /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \ /${PKG_DBDIR:S|/|\\/|g}\// { next; } \ { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \ - { sub("^${PKGGNUDIR}", "gnu/"); } \ { sub("^${PKGINFODIR}/", "info/"); } \ { sub("^${PKGMANDIR}/", "man/"); } \ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \ |