diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:52:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:52:05 +0000 |
| commit | fff8372661e25c3e19b2b8e55edd88c581296096 (patch) | |
| tree | afc346c4cab36d00020a4fce401f55e0a39649fc | |
| parent | 944ecea87ef2763706362a3d3363358ae1c17f06 (diff) | |
| download | pkgsrc-fff8372661e25c3e19b2b8e55edd88c581296096.tar.gz | |
Pull up change in buildlink2 branch:
Rename NO_BUILDLINK2 to NO_BUILDLINK. This better matches what it's
supposed to disable -- the "buildlink" targets.
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 64b8019ebc2..6ac360cfd5d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1033 2002/08/23 11:26:07 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1034 2002/08/25 18:52:05 jlam Exp $ # # This file is in the public domain. # @@ -1080,13 +1080,13 @@ SCRIPTS_ENV+= BATCH=yes .if defined(USE_BUILDLINK2) . if (${USE_BUILDLINK2} == "NO") || (${USE_BUILDLINK2} == "no") -NO_BUILDLINK2= # defined +NO_BUILDLINK= # defined . endif .else -NO_BUILDLINK2= # defined +NO_BUILDLINK= # defined .endif -.if !defined(NO_BUILDLINK2) +.if !defined(NO_BUILDLINK) . include "../../mk/buildlink2/bsd.buildlink2.mk" .endif @@ -1260,7 +1260,7 @@ patch: extract .endif # Disable buildlink -.if defined(NO_BUILDLINK2) && !target(configure) +.if defined(NO_BUILDLINK) && !target(configure) buildlink: patch ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_COOKIE} .endif |