diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
| commit | 6d92080aa240757729992f43156b2924bbda71c4 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /converters/libiconv | |
| parent | 82cd68d38a1d8bd0262376d4a40e4c201e6c55b3 (diff) | |
| download | pkgsrc-6d92080aa240757729992f43156b2924bbda71c4.tar.gz | |
Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
Diffstat (limited to 'converters/libiconv')
| -rw-r--r-- | converters/libiconv/builtin.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk index 65eceadae3c..6d039ba83e7 100644 --- a/converters/libiconv/builtin.mk +++ b/converters/libiconv/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $ .if !defined(_LIBICONV_FOUND) _LIBICONV_FOUND!= \ @@ -7,7 +7,7 @@ _LIBICONV_FOUND!= \ else \ ${ECHO} "yes"; \ fi -MAKEFLAGS+= _LIBICONV_FOUND=${_LIBICONV_FOUND} +BUILDLINK_VARS+= _LIBICONV_FOUND .endif _ICONV_H= /usr/include/iconv.h @@ -17,12 +17,7 @@ IS_BUILTIN.iconv= no . if exists(${_ICONV_H}) IS_BUILTIN.iconv= yes . endif -.endif - -CHECK_BUILTIN.iconv?= no -.if !empty(CHECK_BUILTIN.iconv:M[yY][eE][sS]) -USE_BUILTIN.iconv= yes -.endif +.endif # IS_BUILTIN.iconv .if !defined(USE_BUILTIN.iconv) USE_BUILTIN.iconv?= ${IS_BUILTIN.iconv} @@ -43,6 +38,9 @@ USE_BUILTIN.iconv= no . endif .endif # USE_BUILTIN.iconv +CHECK_BUILTIN.iconv?= no +.if !empty(CHECK_BUILTIN.iconv:M[nN][oO]) + .if !empty(USE_BUILTIN.iconv:M[nN][oO]) _LIBICONV= -liconv .else @@ -66,7 +64,7 @@ ICONV_TYPE!= \ ${ECHO} "native"; \ fi . endif -MAKEFLAGS+= ICONV_TYPE=${ICONV_TYPE} +BUILDLINK_VARS+= ICONV_TYPE .endif .if defined(GNU_CONFIGURE) @@ -76,3 +74,5 @@ CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --without-libiconv-prefix . endif .endif + +.endif # CHECK_BUILTIN.iconv |