summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-08-20 02:09:04 +0000
committerjlam <jlam@pkgsrc.org>2005-08-20 02:09:04 +0000
commit6fe2d57173b6d584673cf8fb610a25fd496f467a (patch)
tree1d20c621b7132efabc90ab4b96364f5387e94353
parent4ecdf6436e05d11a3803c16389b2b69fc57a9fc6 (diff)
downloadpkgsrc-6fe2d57173b6d584673cf8fb610a25fd496f467a.tar.gz
The various bsd.pkginstall.mk variables can be paths relative to
${PREFIX}, so prepend the words with ${PREFIX} in that case when setting CHECK_FILES_SKIP.
-rw-r--r--mk/bsd.pkg.check.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk
index ddc6459ad25..04361f22c20 100644
--- a/mk/bsd.pkg.check.mk
+++ b/mk/bsd.pkg.check.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.check.mk,v 1.12 2005/08/19 22:24:09 jlam Exp $
+# $NetBSD: bsd.pkg.check.mk,v 1.13 2005/08/20 02:09:04 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and defines the
# relevant variables and targets for the various install-time "check"
@@ -60,10 +60,10 @@ CHECK_FILES_SKIP+= ${PREFIX}/${INFO_DIR}/dir
CHECK_FILES_SKIP+= ${PERL5_INSTALLARCHLIB}/perllocal.pod
CHECK_FILES_SKIP+= ${PREFIX}/emul/linux/proc
.for d in ${MAKE_DIRS} ${REQD_DIRS} ${OWN_DIRS}
-CHECK_FILES_SKIP+= ${d}
+CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}
.endfor
.for d o g m in ${MAKE_DIRS_PERMS} ${REQD_DIRS_PERMS} ${OWN_DIRS_PERMS}
-CHECK_FILES_SKIP+= ${d}
+CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}
.endfor
_CHECK_FILES_SKIP_FILTER= ${GREP} -v ${CHECK_FILES_SKIP:@f@-e ${f:Q}@}