diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
| commit | e7133cac25a67cadb35ea338f0d9924c2a9da764 (patch) | |
| tree | 12fb12151bde110b07a88dc1c8875abc30741865 /archivers | |
| parent | 07a9d8dfb209780130723eba289f41872654e7c3 (diff) | |
| download | pkgsrc-e7133cac25a67cadb35ea338f0d9924c2a9da764.tar.gz | |
Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/bzip2/buildlink2.mk | 9 | ||||
| -rw-r--r-- | archivers/bzip2/buildlink3.mk | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk index f1f5ae64b2f..d87f95b99fe 100644 --- a/archivers/bzip2/buildlink2.mk +++ b/archivers/bzip2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ .if !defined(BZIP2_BUILDLINK2_MK) BZIP2_BUILDLINK2_MK= # defined @@ -37,10 +37,9 @@ _NEED_BZIP2= YES . endfor .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mbzip2) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbzip2) _NEED_BZIP2= YES . endif .endif diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index 7f07640137c..a4b4f1d3c05 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ @@ -26,10 +26,9 @@ BUILDLINK_IS_BUILTIN.bzip2!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}" .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mbzip2) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbzip2) BUILDLINK_USE_BUILTIN.bzip2= NO . endif .endif |