diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-09 16:12:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-09 16:12:08 +0000 |
| commit | 2cc3f64abbdb729485ecbe87c5d3dd083e8172de (patch) | |
| tree | af95f72bd6e0f55ae53e0ac5ad2b64683832ca7d /mk | |
| parent | ac82fbec6352b2d53d5d97b8c595c23feddb89e2 (diff) | |
| download | pkgsrc-2cc3f64abbdb729485ecbe87c5d3dd083e8172de.tar.gz | |
Add a new variable CHECK_FILES_SUPPORTED which is a package-settable
variable to show whether the package supports running the check-files
target.
Set CHECK_FILES_SUPPORTED to "no" in pkgtools/pkg_install in the case
where the PREFIX does not match ${LOCALBASE} it's likely the tools are
being installed in some place that's completely outside pkgsrc control,
and check-files fails horribly in that case.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/check/bsd.check-vars.mk | 3 | ||||
| -rw-r--r-- | mk/check/check-files.mk | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/check/bsd.check-vars.mk b/mk/check/bsd.check-vars.mk index 2670e0feb67..7794e6dc4dd 100644 --- a/mk/check/bsd.check-vars.mk +++ b/mk/check/bsd.check-vars.mk @@ -1,10 +1,11 @@ -# $NetBSD: bsd.check-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $ +# $NetBSD: bsd.check-vars.mk,v 1.3 2006/06/09 16:12:08 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where # bsd.check.mk is included. # +CHECK_FILES_SUPPORTED?= yes CHECK_SHLIBS_SUPPORTED?= yes USE_TOOLS+= awk cat cmp diff echo find grep rm sed test touch true diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk index 3def14b5745..74a21898d62 100644 --- a/mk/check/check-files.mk +++ b/mk/check/check-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-files.mk,v 1.3 2006/06/09 13:59:08 jlam Exp $ +# $NetBSD: check-files.mk,v 1.4 2006/06/09 16:12:08 jlam Exp $ .if defined(PKG_DEVELOPER) CHECK_FILES?= yes @@ -174,7 +174,12 @@ check-files-varbase: ${_CHECK_FILES_ERRMSG.varbase} # subtarget. # .PHONY: check-files +.if !empty(CHECK_FILES_SUPPORTED:M[nN][oO]) +check-files: + @${DO_NADA} +.else check-files: check-files-message ${_CHECK_FILES_ERRMSGS} error-check +.endif .PHONY: check-files-message check-files-message: |