diff options
| author | agc <agc@pkgsrc.org> | 2001-03-13 09:41:36 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-03-13 09:41:36 +0000 |
| commit | 969f45aafeb72a65ca6dfbfb6c9867a280296378 (patch) | |
| tree | d1b586275085db369b6695c8b8577480321819e8 /mk/bsd.prefs.mk | |
| parent | 1d265fdb4ae379078cd6df6546b708a6f35a10e3 (diff) | |
| download | pkgsrc-969f45aafeb72a65ca6dfbfb6c9867a280296378.tar.gz | |
Only add DIGEST_VERSION to MAKEFLAGS when we know it's a valid version.
Addresses PR 12397
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index eee5adb7a86..147be950638 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.24 2001/03/10 10:53:15 tron Exp $ +# $NetBSD: bsd.prefs.mk,v 1.25 2001/03/13 09:41:36 agc Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -163,12 +163,10 @@ DIGEST:= ${LOCALBASE}/bin/digest MAKEFLAGS+= DIGEST=${DIGEST} .endif -.if !defined(DIGEST_VERSION) -.if exists(${DIGEST}) -DIGEST_VERSION!= ${DIGEST} -V -.else -DIGEST_VERSION= ${DIGEST_REQD} -.endif +.if !exists(${DIGEST}) +DIGEST_VERSION= 20010301 +.elif !defined(DIGEST_VERSION) +DIGEST_VERSION!= ${DIGEST} -V 2>/dev/null MAKEFLAGS+= DIGEST_VERSION="${DIGEST_VERSION}" .endif |