diff options
| author | tv <tv@pkgsrc.org> | 2005-01-24 18:04:24 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-24 18:04:24 +0000 |
| commit | db5bb1ad1df47b33036d7218fbf0616239a6435b (patch) | |
| tree | 07c4919ed46680b05ce1e5343710c079bc5c3b0b /mk | |
| parent | 1935d32e419948dec3f402e1b862ef85bd77384f (diff) | |
| download | pkgsrc-db5bb1ad1df47b33036d7218fbf0616239a6435b.tar.gz | |
Merge down janitorial change from tv-derecurse branch:
No need to do .som_done dance; just show the message as part of the
pre-extract phase. If that means showing it more than once if the extract
is interrupted and restarted, no harm done.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.options.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index a5d50251fb1..b9f25198d70 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.15 2005/01/15 08:59:28 adrianp Exp $ +# $NetBSD: bsd.options.mk,v 1.16 2005/01/24 18:04:24 tv Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -192,13 +192,10 @@ show-options: @${ECHO} "default: ${_PKG_OPTIONS_DEFAULT}" @${ECHO} "enabled: ${_PKG_OPTIONS_ENABLED}" -.PHONY: pre-install-depends supported-options-message -pre-install-depends: supported-options-message -.if !defined(PKG_SUPPORTED_OPTIONS) -supported-options-message: # do nothing -.else -supported-options-message: ${WRKDIR}/.som_done -${WRKDIR}/.som_done: ${WRKDIR} +.if defined(PKG_SUPPORTED_OPTIONS) +.PHONY: supported-options-message +pre-extract: supported-options-message +supported-options-message: . if !empty(PKG_SUPPORTED_OPTIONS) @${ECHO} "==========================================================================" @${ECHO} "The supported build options for this package are:" @@ -226,6 +223,5 @@ ${WRKDIR}/.som_done: ${WRKDIR} . undef _var_ @${ECHO} "" @${ECHO} "==========================================================================" - @${TOUCH} ${.TARGET} . endif .endif |