diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-04 22:06:03 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-04 22:06:03 +0000 |
| commit | 6c303e9a8c341ff74ab2b0a42f16367d9487ab21 (patch) | |
| tree | 3d9ea46784745b8885c003962891f7b7f85a38a9 | |
| parent | 1ccd96137a6a9df47e7165a420c92a6410fa0699 (diff) | |
| download | pkgsrc-6c303e9a8c341ff74ab2b0a42f16367d9487ab21.tar.gz | |
Handle info directory trees that aren't rooted directly in ${PREFIX}, e.g.
${PREFIX}/<pkg>/info, etc.
| -rw-r--r-- | mk/plist/plist-info.awk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk index d345fe7d27f..87c1d67375c 100644 --- a/mk/plist/plist-info.awk +++ b/mk/plist/plist-info.awk @@ -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 @@ BEGIN { ### 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 @@ BEGIN { ### 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$", "") |