summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2019-09-06 09:00:35 +0000
committerjperkin <jperkin@pkgsrc.org>2019-09-06 09:00:35 +0000
commit01fcc4f7a580770f83d205eaf0de482ed0ee711d (patch)
treeb807d77d887500d555c68ec5eac1e31d733a4e0b /mk
parent58878724d819f3b0bc198b67f6002cdee15182f1 (diff)
downloadpkgsrc-01fcc4f7a580770f83d205eaf0de482ed0ee711d.tar.gz
mk: Skip CTF_FILES_SKIP before anything else.
Diffstat (limited to 'mk')
-rw-r--r--mk/install/install.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk
index a7226e3c9c4..67208409ed1 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -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 \