CVS commit: pkgsrc/mk/install

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Sep  6 09:00:35 UTC 2019

Modified Files:
        pkgsrc/mk/install: install.mk

Log Message:
mk: Skip CTF_FILES_SKIP before anything else.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/mk/install/install.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/install/install.mk
diff -u pkgsrc/mk/install/install.mk:1.77 pkgsrc/mk/install/install.mk:1.78
--- pkgsrc/mk/install/install.mk:1.77   Mon Sep  2 02:23:03 2019
+++ pkgsrc/mk/install/install.mk        Fri Sep  6 09:00:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.77 2019/09/02 02:23:03 rillig Exp $
+# $NetBSD: install.mk,v 1.78 2019/09/06 09:00:35 jperkin Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -349,11 +349,11 @@ install-ctf: plist
        @${STEP_MSG} "Generating CTF data"
        ${RUN}cd ${DESTDIR:Q}${PREFIX:Q};                               \
        ${CAT} ${_PLIST_NOKEYWORDS} | while read f; do                  \
-               [ ! -h "$${f}" ] || continue;                           \
                case "$${f}" in                                         \
                ${CTF_FILES_SKIP:@p@${p}) continue ;;@}                 \
                *) ;;                                                   \
                esac;                                                   \
+               [ ! -h "$${f}" ] || continue;                           \
                tmp_f="$${f}.XXX";                                      \
                if ${CTFCONVERT} -o "$${tmp_f}" "$${f}" 2>/dev/null; then \
                        if [ -f "$${tmp_f}" -a -f "$${f}" ]; then       \