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

[openwrt/svn-archive/packages.git] / libs / libgphoto2 / Makefile

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 3679e013cc95c6364153bd73a8e89e69ed9a645a..897c1e34c9d500b7854a855bc9066ea48cb41693 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -20,6 +20,7 @@ PKG_LIBTOOL_PATHS:=. libgphoto2_port
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libgphoto2/Default
   SECTION:=libs
@@ -29,7 +30,7 @@ endef
 
 define Package/libgphoto2
   $(call Package/libgphoto2/Default)
-  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl +libiconv
+  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS)
   TITLE:=The basic library of the gphoto2 program.
   MENU:=1
 endef
@@ -50,8 +51,8 @@ CONFIGURE_ARGS += \
        --without-libintl-prefix \
 
 CONFIGURE_VARS += \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-       LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+       CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+       LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
        LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
        LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
        LIBUSB_CFLAGS="$$$$CPPFLAGS" \