From feae3109e8d4a501ca91f19c95a78b5d0bfbdda4 Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Fri, 6 Sep 2013 10:40:38 +0000 Subject: [PATCH] Use Makefile.inc instead of .export. --- lib/libiconv_modules/Makefile | 3 --- lib/libiconv_modules/Makefile.inc | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libiconv_modules/Makefile b/lib/libiconv_modules/Makefile index 2bb09da7253..1a7213612b8 100644 --- a/lib/libiconv_modules/Makefile +++ b/lib/libiconv_modules/Makefile @@ -2,9 +2,6 @@ .include -CFLAGS+= -Dbool=_Bool -.export CFLAGS - SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \ UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \ mapper_parallel mapper_serial mapper_std mapper_zone diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 994939008ab..3b25374b91e 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -5,6 +5,9 @@ SHLIB_MAJOR= 4 WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../libc/iconv + +CFLAGS+= -Dbool=_Bool + .if !defined(COMPAT_32BIT) SHLIBDIR= /usr/lib/i18n .else