use nls.mk

SVN-Revision: 25332

diff --git a/phone/fso-gpsd/Makefile b/phone/fso-gpsd/Makefile
index 0fea28343b0f76e824e94620a900d2543a5de915..aeda407dd75659bd7de08a745a1b8103bbb4d874 100644 (file)
--- 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 933d44784af593a008b10c57f5d979e927ed6e17..74da48629b43b6cc25a69c2ac443cc8defd4db23 100644 (file)
--- 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