pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/plist Fix print-PLIST with a custom PKGGNUDIR.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e3946970193b
branches: trunk
changeset: 621165:e3946970193b
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Fri Jul 05 15:31:54 2013 +0000
description:
Fix print-PLIST with a custom PKGGNUDIR.
diffstat:
mk/plist/print-plist.mk | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r 0fbc9fb30fca -r e3946970193b mk/plist/print-plist.mk
--- a/mk/plist/print-plist.mk Fri Jul 05 15:10:00 2013 +0000
+++ b/mk/plist/print-plist.mk Fri Jul 05 15:31:54 2013 +0000
@@ -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 @@
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 @@
/${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; } \
Home |
Main Index |
Thread Index |
Old Index