[pkgsrc/trunk]: pkgsrc/mk/plist Apply PRINT_PLIST_AWK and _PLIST_PLIST_AWK_SU...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/636084515636
branches:  trunk
changeset: 512450:636084515636
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue May 09 21:37:33 2006 +0000

description:
Apply PRINT_PLIST_AWK and _PLIST_PLIST_AWK_SUBST in the same order
for both files and directories.

diffstat:

 mk/plist/print-plist.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r e756eba288f4 -r 636084515636 mk/plist/print-plist.mk
--- a/mk/plist/print-plist.mk   Tue May 09 21:18:49 2006 +0000
+++ b/mk/plist/print-plist.mk   Tue May 09 21:37:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.6 2006/04/17 06:12:46 jlam Exp $
+# $NetBSD: print-plist.mk,v 1.7 2006/05/09 21:37:33 minskim Exp $
 
 ###
 ### Automatic PLIST generation
@@ -126,6 +126,7 @@
         | ${AWK} '                                                     \
                { sub("${PREFIX}/\\./", ""); }                          \
                ${_PRINT_PLIST_AWK_IGNORE} { next; }                    \
+               ${PRINT_PLIST_AWK}                                      \
                ${_PRINT_PLIST_AWK_SUBST}                               \
                /^@/ { print $$0; next }                                \
                /.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+\.[0-9]+$$/ {         \
@@ -146,7 +147,6 @@
                        if ('$$genlinks') print $$0;                    \
                        next;                                           \
                }                                                       \
-               ${PRINT_PLIST_AWK}                                      \
                { print $$0; }'
        ${_PKG_SILENT}${_PKG_DEBUG}\
        for i in `${_PRINT_PLIST_DIRS_CMD}                              \