make libintl and libiconv stub/full implementations switchable, use the new include...

[openwrt/svn-archive/packages.git] / Xorg / lib / pangomm / Makefile

diff --git a/Xorg/lib/pangomm/Makefile b/Xorg/lib/pangomm/Makefile
index be3841bb40b24be5e584cfdcefd22af0ea70ba97..40ed5d6c680c08cbc86f4c97153867e319ae2cb3 100644 (file)
--- a/Xorg/lib/pangomm/Makefile
+++ b/Xorg/lib/pangomm/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=\
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/pangomm
   SECTION:=xorg-libraries