pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/install mk: Skip CTF_FILES_SKIP before anything else.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f98130d964a
branches:  trunk
changeset: 400861:9f98130d964a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Sep 06 09:00:35 2019 +0000

description:
mk: Skip CTF_FILES_SKIP before anything else.

diffstat:

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

diffs (22 lines):

diff -r 2eb908357b4d -r 9f98130d964a mk/install/install.mk
--- a/mk/install/install.mk     Fri Sep 06 08:51:57 2019 +0000
+++ b/mk/install/install.mk     Fri Sep 06 09:00:35 2019 +0000
@@ -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 @@
        @${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       \



Home | Main Index | Thread Index | Old Index