[pkgsrc/trunk]: pkgsrc/mk/plist Handle info directory trees that aren't roote...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f276a32a3b3
branches:  trunk
changeset: 509173:7f276a32a3b3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Mar 04 22:06:03 2006 +0000

description:
Handle info directory trees that aren't rooted directly in ${PREFIX}, e.g.
${PREFIX}/<pkg>/info, etc.

diffstat:

 mk/plist/plist-info.awk |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r fc0c937fe2ef -r 7f276a32a3b3 mk/plist/plist-info.awk
--- a/mk/plist/plist-info.awk   Sat Mar 04 21:28:51 2006 +0000
+++ b/mk/plist/plist-info.awk   Sat Mar 04 22:06:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist-info.awk,v 1.5 2006/02/07 19:18:42 jlam Exp $
+# $NetBSD: plist-info.awk,v 1.6 2006/03/04 22:06:03 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -65,7 +65,7 @@
 ### Ignore *-1, *-2, etc. files in the PLIST as we get the list of
 ### installed split files below.
 ###
-/^[^@]/ && /^info\/[^\/]*(\.info)?-[0-9]+(\.gz)?$/ {
+/^[^@]/ && /^([^\/]*\/)*info\/[^\/]*(\.info)?-[0-9]+(\.gz)?$/ {
        next
 }
 
@@ -73,8 +73,12 @@
 ### For each info page entry, print all of the installed info sub-pages
 ### associated with that entry.
 ###
-/^[^@]/ && /^info\/[^\/]*(\.info)?(\.gz)?$/ {
-       sub("^info/", INFO_DIR "/")
+/^[^@]/ && /^([^\/]*\/)*info\/[^\/]*(\.info)?(\.gz)?$/ {
+       if (match($0, "^info/") > 0) {
+               sub("^info/", INFO_DIR "/")
+       } else {
+               sub("/info/", "/" INFO_DIR "/")
+       }
        cmd = TEST " -f " PREFIX "/" $0
        if (system(cmd) == 0) {
                sub("\\.gz$", "")