diff options
| author | jlam <jlam> | 2004-02-05 07:06:15 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 07:06:15 +0000 |
| commit | b1770a7720f03a2832f44de82413ac976f8a3c93 (patch) | |
| tree | 12fb12151bde110b07a88dc1c8875abc30741865 /converters | |
| parent | 91bc291f41ded5a7610d7def5080ce479b65499e (diff) | |
| download | pkgsrc-b1770a7720f03a2832f44de82413ac976f8a3c93.tar.gz | |
Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 9 | ||||
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index 3db17f8708e..da186c14800 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 06:58:02 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2004/02/05 07:06:15 jlam Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -33,10 +33,9 @@ _NEED_ICONV= 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:Miconv) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Miconv) _NEED_ICONV= YES . endif .endif diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index da417dcb558..6079e90643f 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/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}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -20,10 +20,9 @@ BUILDLINK_IS_BUILTIN.iconv= YES . endif .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Miconv) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Miconv) BUILDLINK_USE_BUILTIN.iconv= NO . endif .endif |