diff options
| author | rillig <rillig> | 2007-12-01 10:56:31 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-12-01 10:56:31 +0000 |
| commit | a1d732ce11a869431f8958500c64c068f823420e (patch) | |
| tree | 3a9b06772bbd87f0ac5fabcf356f77884cbfd98f /mk | |
| parent | e3b3a02a1a40a5167580caa0900a8a3d10ca004d (diff) | |
| download | pkgsrc-a1d732ce11a869431f8958500c64c068f823420e.tar.gz | |
If a package defines FETCH_MESSAGE, show that instead of the generic
instructions.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 85a698e359a..b248f1fa28b 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.30 2007/09/06 20:54:53 joerg Exp $ +# $NetBSD: fetch.mk,v 1.31 2007/12/01 10:56:31 rillig Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -151,7 +151,7 @@ ${DISTDIR}/${_file_}: fetch-check-interactive do-fetch-file error-check ### .PHONY: fetch-check-interactive fetch-check-interactive: .USEBEFORE -.if !empty(INTERACTIVE_STAGE:Mfetch) && defined(BATCH) +.if !empty(INTERACTIVE_STAGE:Mfetch) && defined(BATCH) && !defined(FETCH_MESSAGE) @${TEST} ! -f ${.TARGET} || exit 0; \ ${ERROR_MSG} "The fetch stage of this package requires user interaction to download"; \ ${ERROR_MSG} "the distfiles. Please fetch the distfiles manually and place them in:"; \ |