libiconv-stub: remove

[openwrt/staging/wigyori.git] / include / nls.mk

diff --git a/include/nls.mk b/include/nls.mk
index 163e480932300f065b8819c32b1659e513381ccc..90fc27660f9d6b4c2b94669be3c7ebe82ec1b035 100644 (file)
--- a/include/nls.mk
+++ b/include/nls.mk
@@ -10,27 +10,37 @@ ifeq ($(CONFIG_BUILD_NLS),y)
        INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
        INTL_FULL:=1
 
-# iconv stub
 else
-       ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
+       ICONV_PREFIX:=
        ICONV_FULL:=
 
-       INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-stub
+       INTL_PREFIX:=
        INTL_FULL:=
 endif
 
 PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS
-PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv
 
 ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
-ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(ICONV_PREFIX)/lib
+ifeq ($(CONFIG_BUILD_NLS),y)
+       ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
+       ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
+       ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(ICONV_PREFIX)/lib
+else
+       ICONV_CFLAGS:=
+       ICONV_CPPFLAGS:=
+       ICONV_LDFLAGS:=
+endif
 
 INTL_DEPENDS:=+BUILD_NLS:libintl-full
-INTL_CFLAGS:=-I$(INTL_PREFIX)/include
-INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include
-INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib -Wl,-rpath-link=$(INTL_PREFIX)/lib
+ifeq ($(CONFIG_BUILD_NLS),y)
+       INTL_CFLAGS:=-I$(INTL_PREFIX)/include
+       INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include
+       INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib -Wl,-rpath-link=$(INTL_PREFIX)/lib
+else
+       INTL_CFLAGS:=
+       INTL_CPPFLAGS:=
+       INTL_LDFLAGS:=
+endif
 
 TARGET_CFLAGS += $(ICONV_CFLAGS) $(INTL_CFLAGS)
 TARGET_CPPFLAGS += $(ICONV_CPPFLAGS) $(INTL_CPPFLAGS)