From f40146265b997c8548854bbe997876e18423c888 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Feb 2011 20:43:21 +0000
Subject: [PATCH] [phone] use nls.mk

SVN-Revision: 25332
---
 phone/fso-gpsd/Makefile        | 9 +--------
 phone/fso-gsm0710muxd/Makefile | 5 +++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/phone/fso-gpsd/Makefile b/phone/fso-gpsd/Makefile
index 0fea28343b..aeda407dd7 100644
--- a/phone/fso-gpsd/Makefile
+++ b/phone/fso-gpsd/Makefile
@@ -22,14 +22,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/libiconv/include
-
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/fso-gpsd
   SECTION:=phone
diff --git a/phone/fso-gsm0710muxd/Makefile b/phone/fso-gsm0710muxd/Makefile
index 933d44784a..74da48629b 100644
--- a/phone/fso-gsm0710muxd/Makefile
+++ b/phone/fso-gsm0710muxd/Makefile
@@ -19,9 +19,10 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include -I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib -liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
+EXTRA_CFLAGS+=-I$(ICONV_PREFIX)/include -I$(INTL_PREFIX)/include
+EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib -liconv $(if $(INTL_FULL),-L$(INTL_PREFIX)/lib -lintl)
 
 define Package/fso-gsm0710muxd
   SECTION:=phone
-- 
2.30.2